openhab-scripting 5.12.0 → 5.13.0

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

@@ -36,8 +36,14 @@ module OpenHAB
       # Base class for all widgets
       # @see org.openhab.core.model.sitemap.sitemap.Widget
       class WidgetBuilder
-        # This is copied directly out of UIComponentSitemapProvider.java
-        CONDITION_PATTERN = /(?<item>[A-Za-z]\w*)?\s*(?<condition>==|!=|<=|>=|<|>)?\s*(?<sign>\+|-)?(?<state>.+)/.freeze
+        include Core::EntityLookup
+
+        # This is copied out of UIComponentSitemapProvider.java
+        # The original pattern will match plain state e.g. "ON" as item="O" and state="N"
+        # this pattern is modified so it matches as item=nil and state="ON" by using atomic grouping `(?>subexpression)`
+        # rubocop:disable Layout/LineLength
+        CONDITION_PATTERN = /(?>(?<item>[A-Za-z]\w*)?\s*(?<condition>==|!=|<=|>=|<|>))?\s*(?<sign>\+|-)?(?<state>.+)/.freeze
+        # rubocop:enable Layout/LineLength
         private_constant :CONDITION_PATTERN
 
         # @return [String, nil]
@@ -45,19 +51,39 @@ module OpenHAB
         # The item whose state to show
         # @return [String, Core::Items::Item, nil]
         attr_accessor :item
-        # @return [String, nil]
+        # The icon to show
+        # It can be a string, or a hash of conditions and icons.
+        # @example A simple icon
+        #   sitemaps.build { text icon: "f7:house" }
+        #
+        # @example A dynamic icon with conditions
+        #   sitemaps.build do
+        #     text item: Wifi_Status, icon: {
+        #       "ON" => "f7:wifi",
+        #       "OFF" => "f7:wifi_slash",
+        #       default: "f7:wifi_exclamationmark"
+        #     }
+        #   end
+        #
+        # @return [String, Hash<String, String>, Hash<Array<String>, String>, nil]
         # @see https://www.openhab.org/docs/ui/sitemaps.html#icons
         attr_accessor :icon
+        # The static icon to show
+        # This is mutually exclusive with {#icon}
+        # @return [String, nil]
+        # @since openHAB 4.1
+        # @see https://www.openhab.org/docs/ui/sitemaps.html#element-types
+        attr_accessor :static_icon
         # Label color rules
-        # @return [Hash<String, String>]
+        # @return [Hash<String, String>, Hash<Array<String>, String>]
         # @see https://www.openhab.org/docs/ui/sitemaps.html#label-value-and-icon-colors
         attr_reader :label_colors
         # Value color rules
-        # @return [Hash<String, String>]
+        # @return [Hash<String, String>, Hash<Array<String>, String>]
         # @see https://www.openhab.org/docs/ui/sitemaps.html#label-value-and-icon-colors
         attr_reader :value_colors
         # Icon color rules
-        # @return [Hash<String, String>]
+        # @return [Hash<String, String>, Hash<Array<String>, String>]
         # @see https://www.openhab.org/docs/ui/sitemaps.html#label-value-and-icon-colors
         attr_reader :icon_colors
         # Visibility rules
@@ -67,16 +93,22 @@ module OpenHAB
 
         # @param item [String, Core::Items::Item, nil] The item whose state to show (see {#item})
         # @param label [String, nil] (see {#label})
-        # @param icon [String, nil] (see {#icon})
-        # @param label_color [String, Array<String>, nil] One or more label color rules (see {#label_color})
-        # @param value_color [String, Array<String>, nil] One or more value color rules (see {#value_color})
-        # @param icon_color [String, Array<String>, nil] One or more icon color rules (see {#icon_color})
-        # @param visibility [String, Array<String>, nil] One or more visibility rules (see {#visibility})
+        # @param icon [String, Hash<String, String>, Hash<Array<String>, String>, nil] (see {#icon})
+        # @param static_icon [String, nil] (see {#static_icon})
+        # @param label_color [String, Hash<String, String>, Hash<Array<String>, String>, nil]
+        #   One or more label color rules (see {#label_color})
+        # @param value_color [String, Hash<String, String>, Hash<Array<String>, String>, nil]
+        #   One or more value color rules (see {#value_color})
+        # @param icon_color [String, Hash<String, String>, Hash<Array<String>, String>, nil]
+        #   One or more icon color rules (see {#icon_color})
+        # @param visibility [String, Array<String>, Array<Array<String>>, nil]
+        #   One or more visibility rules (see {#visibility})
         # @!visibility private
         def initialize(type,
                        item: nil,
                        label: nil,
                        icon: nil,
+                       static_icon: nil,
                        label_color: nil,
                        value_color: nil,
                        icon_color: nil,
@@ -90,6 +122,7 @@ module OpenHAB
           @item = item
           @label = label
           @icon = icon
+          @static_icon = static_icon
           @visibilities = []
           @label_colors = {}
           @value_colors = {}
@@ -104,18 +137,21 @@ module OpenHAB
         # Adds one or more new rules for setting the label color
         # @return [Hash<String, String>] the current rules
         def label_color(rules)
+          rules = { default: rules } if rules.is_a?(String)
           @label_colors.merge!(rules)
         end
 
         # Adds one or more new rules for setting the value color
         # @return [Hash<String, String>] the current rules
         def value_color(rules)
+          rules = { default: rules } if rules.is_a?(String)
           @value_colors.merge!(rules)
         end
 
         # Adds one or more new rules for setting the icon color
         # @return [Hash<String, String>] the current rules
         def icon_color(rules)
+          rules = { default: rules } if rules.is_a?(String)
           @icon_colors.merge!(rules)
         end
 
@@ -132,31 +168,24 @@ module OpenHAB
           item = item.name if item.respond_to?(:name)
           widget.item = item if item
           widget.label = @label
-          widget.icon = @icon
+
+          raise ArgumentError, "icon and static_icon are mutually exclusive" if icon && static_icon
+
+          if static_icon
+            widget.static_icon = static_icon
+          elsif icon.is_a?(String)
+            widget.icon = @icon
+          elsif icon.is_a?(Hash)
+            add_icons(widget)
+          elsif !icon.nil?
+            raise ArgumentError, "icon must be a String or a Hash"
+          end
 
           add_colors(widget, :label_color, label_colors)
           add_colors(widget, :value_color, value_colors)
           add_colors(widget, :icon_color, icon_colors)
 
-          # @deprecated OH 4.1
-          if SitemapBuilder.factory.respond_to?(:create_condition)
-            add_conditions(widget, :visibility, visibilities, :create_visibility_rule)
-          else
-            visibilities.each do |v|
-              raise ArgumentError, "AND conditions not supported prior to openHAB 4.1" if v.is_a?(Array)
-
-              unless (match = CONDITION_PATTERN.match(v))
-                raise ArgumentError, "Syntax error in visibility rule #{v.inspect}"
-              end
-
-              rule = SitemapBuilder.factory.create_visibility_rule
-              rule.item = match["item"]
-              rule.condition = match["condition"]
-              rule.sign = match["sign"]
-              rule.state = match["state"]
-              widget.visibility.add(rule)
-            end
-          end
+          add_conditions(widget, :visibility, visibilities, :create_visibility_rule)
 
           widget
         end
@@ -173,12 +202,19 @@ module OpenHAB
 
         private
 
-        def add_colors(widget, method, conditions)
-          conditions.each do |condition, color|
-            condition = [condition] unless condition.is_a?(Array)
-            add_conditions(widget, method, condition, :create_color_array) do |color_array|
-              color_array.arg = color
-            end
+        def add_colors(widget, method, colors)
+          # ensure that the default color is at the end, and make the conditions nil (no conditions)
+          colors.delete(:default)&.tap { |default_color| colors.merge!(nil => default_color) }
+
+          add_conditions(widget, method, colors.keys, :create_color_array) do |color_array, key|
+            color_array.arg = colors[key]
+          end
+        end
+
+        def add_icons(widget)
+          icon.delete(:default)&.tap { |default_icon| icon.merge!(nil => default_icon) }
+          add_conditions(widget, :icon_rules, icon.keys, :create_icon_rule) do |icon_array, key|
+            icon_array.arg = icon[key]
           end
         end
 
@@ -186,25 +222,22 @@ module OpenHAB
           return if conditions.empty?
 
           object = widget.send(method)
-          has_and_conditions = conditions.any?(Array)
-          # @deprecated OH 4.1
-          if !SitemapBuilder.factory.respond_to?(:create_condition) && has_and_conditions
+          # @deprecated OH 4.0
+          if conditions.any?(Array) && !SitemapBuilder.factory.respond_to?(:create_condition)
             raise ArgumentError, "AND conditions not supported prior to openHAB 4.1"
           end
 
-          conditions = [conditions] unless has_and_conditions
-
           conditions.each do |sub_conditions|
             container = SitemapBuilder.factory.send(container_method)
 
             add_conditions_to_container(container, sub_conditions)
-            yield container if block_given?
+            yield container, sub_conditions if block_given?
             object.add(container)
           end
         end
 
         def add_conditions_to_container(container, conditions)
-          # @deprecated OH 4.1
+          # @deprecated OH 4.0
           supports_and_conditions = SitemapBuilder.factory.respond_to?(:create_condition)
 
           Array.wrap(conditions).each do |c|
@@ -235,7 +268,7 @@ module OpenHAB
         attr_accessor :mappings
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, mappings: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, mappings: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param mappings [Hash, Array, nil] Mappings from command to label (see {SwitchBuilder#mappings})
         # @!visibility private
         def initialize(type, mappings: nil, **kwargs)
@@ -275,7 +308,7 @@ module OpenHAB
         attr_accessor :step
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, range: nil, step: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, range: nil, step: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param range [Range, nil] Allowed range of the value (see {SetpointBuilder#range})
         # @param step [Numeric,nil] How far the value will change with each button press (see {SetpointBuilder#step})
         # @!visibility private
@@ -309,7 +342,7 @@ module OpenHAB
         attr_writer :switch
 
         # (see SetpointBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, range: nil, step: nil, switch: nil, frequency: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, range: nil, step: nil, switch: nil, frequency: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param switch [true, false, nil]
         #   A short press on the item toggles the item on or off (see {SliderBuilder#switch=})
         # @param frequency [Numeric, nil]
@@ -350,7 +383,7 @@ module OpenHAB
         attr_reader :encoding
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, url: nil, encoding: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, url: nil, encoding: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param [String, nil] url (see {VideoBuilder#url})
         # @param [:mjpeg, :hls, nil] encoding (see {VideoBuilder#encoding})
         # @!visibility private
@@ -408,7 +441,7 @@ module OpenHAB
         attr_accessor :y_axis_pattern
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, service: nil, refresh: nil, period: nil, legend: nil, group: nil, y_axis_pattern: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, service: nil, refresh: nil, period: nil, legend: nil, group: nil, y_axis_pattern: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param service [String, nil]
         #   The persistence service to use (see {ChartBuilder#service})
         # @param refresh [Numeric, nil)]
@@ -477,7 +510,7 @@ module OpenHAB
         attr_accessor :height
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, height: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, height: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param height [Integer] The number of element rows to fill (see {DefaultBuilder#height})
         # @!visibility private
         def initialize(type, height: nil, **kwargs)
@@ -502,7 +535,7 @@ module OpenHAB
         attr_accessor :url
 
         # (see DefaultBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, url: nil, height: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, url: nil, height: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param url [String, nil] (see {WebviewBuilder#url})
         # @!visibility private
         def initialize(type, url: nil, **kwargs)
@@ -528,7 +561,7 @@ module OpenHAB
         attr_accessor :frequency
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, frequency: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, frequency: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param frequency [Numeric, nil] How often to send requests (see {ColorpickerBuilder#frequency})
         # @!visibility private
         def initialize(type, frequency: nil, **kwargs)
@@ -563,7 +596,7 @@ module OpenHAB
         attr_reader :hint
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, hint: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, hint: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param [:text, :number, :date, :time, :datetime, nil] hint
         #   Gives a hint to the user interface to use a widget adapted to a specific use (see {InputBuilder#hint})
         # @!visibility private
@@ -588,11 +621,87 @@ module OpenHAB
         end
       end
 
+      # Builds a `Buttongrid` element
+      # @since openHAB 4.1
+      # @see https://www.openhab.org/docs/ui/sitemaps.html#element-type-buttongrid
+      # @see org.openhab.core.model.sitemap.sitemap.Buttongrid
+      class ButtongridBuilder < WidgetBuilder
+        # @return [Array<Array<int, int, Command, String, String>>]
+        #   An array of buttons to display
+        attr_reader :buttons
+
+        # (see WidgetBuilder#initialize)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, buttons: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @param [Array<Array<int, int, Command, String, String>>] buttons An array of buttons to display.
+        #   Each element is an array with the following elements:
+        #   - row: 1-12
+        #   - column: 1-12
+        #   - command: The command to send when the button is pressed
+        #   - label: The label to display on the button
+        #   - icon: The icon to display on the button (optional)
+        #
+        # @example
+        #   # This creates a buttongrid to emulate a TV remote control
+        #   sitemaps.build do
+        #     buttongrid item: LivingRoom_TV_RCButton, buttons: [
+        #       [1, 1, "BACK", "Back", "f7:return"],
+        #       [1, 2, "HOME", "Menu", "material:apps"],
+        #       [1, 3, "YELLOW", "Search", "f7:search"],
+        #       [2, 2, "UP", "Up", "f7:arrowtriangle_up"],
+        #       [4, 2, "DOWN", "Down", "f7:arrowtriangle_down"],
+        #       [3, 1, "LEFT", "Left", "f7:arrowtriangle_left"],
+        #       [3, 3, "RIGHT", "Right", "f7:arrowtriangle_right"],
+        #       [3, 2, "ENTER", "Enter", "material:adjust"]
+        #     ]
+        #   end
+        #
+        # @see https://www.openhab.org/docs/ui/sitemaps.html#element-type-buttongrid
+        # @!visibility private
+        def initialize(type, buttons: [], **kwargs)
+          super(type, **kwargs)
+          buttons.each { |button| validate_button(button) }
+          @buttons = buttons
+        end
+
+        #
+        # Adds a button to the buttongrid
+        #
+        # @param [Array<int, int, Command, String, String>] button the button to add
+        # @return [Array<Array<int, int, Command, String, String>>] the current buttons
+        #
+        def button(button)
+          validate_button(button)
+          @buttons << button
+        end
+
+        # @!visibility private
+        def build
+          widget = super
+          buttons.each do |button|
+            button_object = SitemapBuilder.factory.create_button
+            button_object.row = button[0]
+            button_object.column = button[1]
+            button_object.cmd = button[2]
+            button_object.label = button[3]
+            button_object.icon = button[4] if button[4]
+            widget.buttons.add(button_object)
+          end
+
+          widget
+        end
+
+        private
+
+        def validate_button(button)
+          return if (4..5).cover?(button.size)
+
+          raise ArgumentError, "Invalid button: '#{button.inspect}'. It must be an array with (4..5) elements"
+        end
+      end
+
       # Parent class for builders of widgets that can contain other widgets.
       # @see org.openhab.core.model.sitemap.sitemap.LinkableWidget
       class LinkableWidgetBuilder < WidgetBuilder
-        include Core::EntityLookup
-
         # allow referring to items that don't exist yet
         self.create_dummy_items = true
 
@@ -609,6 +718,7 @@ module OpenHAB
         #   def frame(item: nil,
         #             label: nil,
         #             icon: nil,
+        #             static_icon: nil,
         #             label_color: nil,
         #             value_color: nil,
         #             icon_color: nil,
@@ -623,6 +733,7 @@ module OpenHAB
         #   def text(item: nil,
         #            label: nil,
         #            icon: nil,
+        #            static_icon: nil,
         #            label_color: nil,
         #            value_color: nil,
         #            icon_color: nil,
@@ -637,6 +748,7 @@ module OpenHAB
         #   def group(item: nil,
         #             label: nil,
         #             icon: nil,
+        #             static_icon: nil,
         #             label_color: nil,
         #             value_color: nil,
         #             icon_color: nil,
@@ -651,6 +763,7 @@ module OpenHAB
         #   def image(item: nil,
         #             label: nil,
         #             icon: nil,
+        #             static_icon: nil,
         #             url: nil,
         #             refresh: nil,
         #             label_color: nil,
@@ -667,6 +780,7 @@ module OpenHAB
         #   def video(item: nil,
         #             label: nil,
         #             icon: nil,
+        #             static_icon: nil,
         #             url: nil,
         #             encoding: nil,
         #             label_color: nil,
@@ -683,6 +797,7 @@ module OpenHAB
         #   def chart(item: nil,
         #             label: nil,
         #             icon: nil,
+        #             static_icon: nil,
         #             service: nil,
         #             refresh: nil,
         #             period: nil,
@@ -703,6 +818,7 @@ module OpenHAB
         #   def webview(item: nil,
         #               label: nil,
         #               icon: nil,
+        #               static_icon: nil,
         #               url: nil,
         #               height: nil,
         #               label_color: nil,
@@ -719,6 +835,7 @@ module OpenHAB
         #   def switch(item: nil,
         #              label: nil,
         #              icon: nil,
+        #              static_icon: nil,
         #              mappings: nil,
         #              label_color: nil,
         #              value_color: nil,
@@ -734,6 +851,7 @@ module OpenHAB
         #   def mapview(item: nil,
         #               label: nil,
         #               icon: nil,
+        #               static_icon: nil,
         #               height: nil,
         #               label_color: nil,
         #               value_color: nil,
@@ -749,6 +867,7 @@ module OpenHAB
         #   def slider(item: nil,
         #              label: nil,
         #              icon: nil,
+        #              static_icon: nil,
         #              range: nil,
         #              step: nil,
         #              switch: nil,
@@ -767,6 +886,7 @@ module OpenHAB
         #   def selection(item: nil,
         #                 label: nil,
         #                 icon: nil,
+        #                 static_icon: nil,
         #                 mappings: nil,
         #                 label_color: nil,
         #                 value_color: nil,
@@ -783,6 +903,7 @@ module OpenHAB
         #   def input(item: nil,
         #             label: nil,
         #             icon: nil,
+        #             static_icon: nil,
         #             hint: nil,
         #             label_color: nil,
         #             value_color: nil,
@@ -790,6 +911,23 @@ module OpenHAB
         #             visibility: nil)
         #   end
         #
+        #   # (see ButtongridBuilder#initialize)
+        #   # Create a new `Buttongrid` element.
+        #   # @yield Block executed in the context of an {ButtongridBuilder}
+        #   # @return [ButtongridBuilder]
+        #   # @since openHAB 4.1
+        #   # @!visibility public
+        #   def buttongrid(item: nil,
+        #                  label: nil,
+        #                  icon: nil,
+        #                  static_icon: nil,
+        #                  buttons: nil,
+        #                  label_color: nil,
+        #                  value_color: nil,
+        #                  icon_color: nil,
+        #                  visibility: nil)
+        #   end
+        #
         #   # (see SetpointBuilder#initialize)
         #   # Create a new `Setpoint` element.
         #   # @yield Block executed in the context of a {SetpointBuilder}
@@ -798,6 +936,7 @@ module OpenHAB
         #   def setpoint(item: nil,
         #               label: nil,
         #               icon: nil,
+        #               static_icon: nil,
         #               range: nil,
         #               step: nil,
         #               label_color: nil,
@@ -814,6 +953,7 @@ module OpenHAB
         #   def colorpicker(item: nil,
         #                   label: nil,
         #                   icon: nil,
+        #                   static_icon: nil,
         #                   frequency: nil,
         #                   label_color: nil,
         #                   value_color: nil,
@@ -829,6 +969,7 @@ module OpenHAB
         #   def default(item: nil,
         #              label: nil,
         #              icon: nil,
+        #              static_icon: nil,
         #              height: nil,
         #              label_color: nil,
         #              value_color: nil,
@@ -849,6 +990,7 @@ module OpenHAB
            slider
            selection
            input
+           buttongrid
            setpoint
            colorpicker
            default].each do |method|
@@ -865,7 +1007,7 @@ module OpenHAB
         end
 
         # (see WidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @!visibility private
         def initialize(*, **)
           super
@@ -915,7 +1057,7 @@ module OpenHAB
         attr_accessor :refresh
 
         # (see LinkableWidgetBuilder#initialize)
-        # @!method initialize(item: nil, label: nil, icon: nil, url: nil, refresh: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
+        # @!method initialize(item: nil, label: nil, icon: nil, static_icon: nil, url: nil, refresh: nil, label_color: nil, value_color: nil, icon_color: nil, visibility: nil)
         # @param url [String, nil] The URL for the image (see {ImageBuilder#url})
         # @param refresh [Numeric, nil] How often to refresh the image (see {ImageBuilder#refresh})
         # @!visibility private

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

@@ -32,6 +32,36 @@ module OpenHAB
       #     end
       #   end
       #
+      # @example Create a Thing within a Bridge
+      #   things.build do
+      #     bridge "mqtt:broker:mosquitto", config: { host: "127.0.0.1", enableDiscovery: false } do
+      #       thing "mqtt:topic:window1", "My Window Sensor" do
+      #         channel "contact1", "contact", config: {
+      #           stateTopic: "zigbee2mqtt/window1/contact",
+      #           on: "false",
+      #           off: "true"
+      #         }
+      #       end
+      #     end
+      #   end
+      #
+      #   items.build do
+      #     contact_item Window1_Contact, channel: "mqtt:topic:window1:contact1"
+      #   end
+      #
+      # @example Create a Thing separately from the Bridge
+      #   things.build do
+      #     bridge = bridge "mqtt:broker:mosquitto", config: { host: "127.0.0.1", enableDiscovery: false }
+      #
+      #     thing "mqtt:topic:window1", "My Window Sensor", bridge: bridge do
+      #       channel "contact1", "contact", config: {
+      #         stateTopic: "zigbee2mqtt/window1/contact",
+      #         on: "false",
+      #         off: "true"
+      #       }
+      #     end
+      #   end
+      #
       # @see ThingBuilder#initialize ThingBuilder#initialize for #thing's parameters
       # @see ChannelBuilder#initialize ChannelBuilder#initialize for #channel's parameters
       # @see Items::Builder
@@ -61,6 +91,7 @@ module OpenHAB
 
         def build(klass, *args, **kwargs, &block)
           builder = klass.new(*args, **kwargs)
+          builder.parent_builder = self if builder.respond_to?(:parent_builder=)
           builder.instance_eval(&block) if block
           thing = builder.build
 
@@ -190,6 +221,7 @@ module OpenHAB
           @location = location.label if location.is_a?(Item)
           @config = config.transform_keys(&:to_s)
           @enabled = enabled
+          @builder = org.openhab.core.thing.binding.builder.ThingBuilder unless instance_variable_defined?(:@builder)
         end
 
         # Add an explicitly configured channel to this item
@@ -222,13 +254,12 @@ module OpenHAB
             @channels = merged_channels.values
           end
 
-          builder = org.openhab.core.thing.binding.builder.ThingBuilder
-                       .create(thing_type_uid, uid)
-                       .with_label(label)
-                       .with_location(location)
-                       .with_configuration(configuration)
-                       .with_bridge(bridge_uid)
-                       .with_channels(channels)
+          builder = @builder.create(thing_type_uid, uid)
+                            .with_label(label)
+                            .with_location(location)
+                            .with_configuration(configuration)
+                            .with_bridge(bridge_uid)
+                            .with_channels(channels)
 
           builder.with_properties(thing_type.properties) if thing_type
 
@@ -244,16 +275,26 @@ module OpenHAB
 
       # The BridgeBuilder DSL allows you to customize a thing
       class BridgeBuilder < ThingBuilder
+        # @!visibility private
+        attr_accessor :parent_builder
+
+        # Constructor for BridgeBuilder
+        # @see ThingBuilder#initialize
+        def initialize(uid, label = nil, binding: nil, type: nil, bridge: nil, location: nil, config: {}, enabled: nil)
+          @builder = org.openhab.core.thing.binding.builder.BridgeBuilder
+          super
+        end
+
         # Create a new Bridge with this Bridge as its Bridge
         # @see BridgeBuilder#initialize
         def bridge(*args, **kwargs, &block)
-          super(*args, bridge: self, **kwargs, &block)
+          parent_builder.bridge(*args, bridge: self, **kwargs, &block)
         end
 
         # Create a new Thing with this Bridge as its Bridge
         # @see ThingBuilder#initialize
         def thing(*args, **kwargs, &block)
-          super(*args, bridge: self, **kwargs, &block)
+          parent_builder.thing(*args, bridge: self, **kwargs, &block)
         end
       end
 
@@ -268,13 +309,6 @@ module OpenHAB
                     :description,
                     :auto_update_policy
 
-        class << self
-          # @!visibility private
-          def channel_type_registry
-            @channel_type_registry ||= OSGi.service("org.openhab.core.thing.type.ChannelTypeRegistry")
-          end
-        end
-
         #
         # Constructor for ChannelBuilder
         #
@@ -283,7 +317,7 @@ module OpenHAB
         # @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.
+        # @param [Thing] thing The thing associated with this channel.
         #   This parameter is not needed for the {ThingBuilder#channel} method.
         # @param [String] description The channel description.
         # @param [String] group The group name.
@@ -355,7 +389,7 @@ module OpenHAB
         # @!attribute [r] accepted_item_type
         # @return [String] The accepted item type.
         def accepted_item_type
-          @accepted_item_type ||= self.class.channel_type_registry.get_channel_type(type)&.item_type
+          @accepted_item_type ||= type.channel_type&.item_type
         end
 
         private