openhab-scripting 5.35.1 → 5.36.0

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

@@ -12,13 +12,7 @@ module OpenHAB
         #
         class Cron < Trigger
           # Trigger ID for Cron Triggers
-          # @deprecated OH 3.4
-          CRON_TRIGGER_MODULE_ID = if OpenHAB::Core.version >= OpenHAB::Core::V4_0
-                                     "timer.GenericCronTrigger"
-                                   else
-                                     # @deprecated OH3.4 We need to use a custom CronTrigger handler
-                                     "jsr223.jruby.CronTrigger"
-                                   end
+          CRON_TRIGGER_MODULE_ID = "timer.GenericCronTrigger"
 
           #
           # Returns a default map for cron expressions that fires every second
@@ -125,7 +119,7 @@ module OpenHAB
           # @return [Boolean] true if all symbols are day-of-week symbols
           #
           def self.all_dow_symbols?(symbols)
-            (symbols & DAY_OF_WEEK) == symbols
+            (symbols - DAY_OF_WEEK).empty?
           end
 
           #
@@ -138,7 +132,7 @@ module OpenHAB
           #
           def self.from_dow_symbols(symbols, at)
             dow = DAY_OF_WEEK_MAP.fetch_values(*symbols).join(",")
-            expression_map = CRON_EXPRESSION_MAP.merge(dow: dow, hour: 0, minute: 0, second: 0)
+            expression_map = CRON_EXPRESSION_MAP.merge(dow:, hour: 0, minute: 0, second: 0)
             expression_map = at_condition(expression_map, at) if at
             map_to_cron(expression_map)
           end
@@ -239,11 +233,7 @@ module OpenHAB
           #
           #
           def trigger(config:, attach:)
-            # @deprecated OH3.4 needs a custom CronTriggerHandlerFactory
-            if OpenHAB::Core.version < OpenHAB::Core::V4_0
-              CronHandler::CronTriggerHandlerFactory.instance # ensure it's registered
-            end
-            append_trigger(type: CRON_TRIGGER_MODULE_ID, config: config, attach: attach)
+            append_trigger(type: CRON_TRIGGER_MODULE_ID, config:, attach:)
           end
         end
       end

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

@@ -22,20 +22,20 @@ module OpenHAB
           #
           def trigger(item:, to:, attach:)
             unless Conditions.state?(to)
-              conditions = Conditions::Generic.new(to: to)
+              conditions = Conditions::Generic.new(to:)
               to = nil
             end
 
             type, config = case item
                            when GroupItem::Members
-                             group_update(item: item, to: to)
+                             group_update(item:, to:)
                            when Core::Things::Thing,
                  Core::Things::ThingUID
-                             thing_update(thing: item, to: to)
+                             thing_update(thing: item, to:)
                            else
-                             item_update(item: item, to: to)
+                             item_update(item:, to:)
                            end
-            append_trigger(type: type, config: config, attach: attach, conditions: conditions)
+            append_trigger(type:, config:, attach:, conditions:)
           end
 
           private
@@ -92,7 +92,7 @@ module OpenHAB
           #  second element is a Hash configuring trigger
           #
           def thing_update(thing:, to:)
-            trigger_for_thing(thing: thing, type: THING_UPDATE, to: to)
+            trigger_for_thing(thing:, type: THING_UPDATE, to:)
           end
         end
       end

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

@@ -21,138 +21,83 @@ module OpenHAB
             @factory ||= OSGi.service("org.openhab.core.service.WatchServiceFactory")
           end
 
-          # Due to the refactoring in OH4, we need a different watcher implementation
-          if WatchHandler.factory
-            # A class that implements openHAB4's WatchEventListener
-            # and also creates and removes a unique WatchService for each instance
-            class Watcher
-              # Use full java class name here to satisfy YARD linter
-              include org.openhab.core.service.WatchService::WatchEventListener
-              java_import org.openhab.core.service.WatchService
-
-              # Hash of event symbols as strings to map to WatchService events
-              STRING_TO_EVENT = {
-                created: WatchService::Kind::CREATE,
-                deleted: WatchService::Kind::DELETE,
-                modified: WatchService::Kind::MODIFY
-              }.transform_keys(&:to_s).freeze
-
-              # Hash of WatchService event kinds to ruby symbols
-              EVENT_TO_SYMBOL = STRING_TO_EVENT.invert.transform_values(&:to_sym).freeze
-
-              # constructor
-              def initialize(path, subdirs, types, &block)
-                @types = types.map { |type| STRING_TO_EVENT[type] }
-                @block = block
-                @subdirs = subdirs
-                @path = Pathname.new(path)
-                @custom_watcher = nil
-                return if path.to_s.start_with?(OpenHAB::Core.config_folder.to_s)
-
-                @custom_watcher = "jrubyscripting-#{SecureRandom.uuid}"
-              end
-
-              # Creates a new Watch Service and registers ourself as a listener
-              # This isn't an OSGi service, but it's called by {WatchTriggerHandler} below.
-              def activate
-                java_path = java.nio.file.Path.of(@path.to_s)
-
-                service_name = WatchService::SERVICE_PID
-                filter = if @custom_watcher
-                           WatchHandler.factory.create_watch_service(@custom_watcher, java_path)
-                           logger.trace { "Created a watch service #{@custom_watcher} for #{@path}" }
-                           "(name=#{@custom_watcher})"
-                         else
-                           logger.trace { "Using configWatcher service for #{@path}" }
-                           WatchService::CONFIG_WATCHER_FILTER
-                         end
-
-                start = Time.now
-                sleep 0.1 until (@watch_service = OSGi.service(service_name, filter: filter)) || Time.now - start > 2
-
-                unless @watch_service
-                  logger.warn("Watch service is not ready in time. #{@path} will not be monitored!")
-                  return
-                end
-
-                @watch_service.register_listener(self, java_path, @subdirs)
-                logger.trace { "Registered watch service listener for #{@path} including subdirs: #{@subdirs}" }
-              end
-
-              # Unregister ourself as a listener and remove the watch service
-              def deactivate
-                @watch_service&.unregister_listener(self)
-                return unless @custom_watcher
+          # A class that implements openHAB4's WatchEventListener
+          # and also creates and removes a unique WatchService for each instance
+          class Watcher
+            # Use full java class name here to satisfy YARD linter
+            include org.openhab.core.service.WatchService::WatchEventListener
+            java_import org.openhab.core.service.WatchService
+
+            # Hash of event symbols as strings to map to WatchService events
+            STRING_TO_EVENT = {
+              created: WatchService::Kind::CREATE,
+              deleted: WatchService::Kind::DELETE,
+              modified: WatchService::Kind::MODIFY
+            }.transform_keys(&:to_s).freeze
+
+            # Hash of WatchService event kinds to ruby symbols
+            EVENT_TO_SYMBOL = STRING_TO_EVENT.invert.transform_values(&:to_sym).freeze
+
+            # constructor
+            def initialize(path, subdirs, types, &block)
+              @types = types.map { |type| STRING_TO_EVENT[type] }
+              @block = block
+              @subdirs = subdirs
+              @path = Pathname.new(path)
+              @custom_watcher = nil
+              return if path.to_s.start_with?(OpenHAB::Core.config_folder.to_s)
+
+              @custom_watcher = "jrubyscripting-#{SecureRandom.uuid}"
+            end
 
-                WatchHandler.factory.remove_watch_service(@custom_watcher)
-                logger.trace { "Removed watch service #{@custom_watcher} for #{@path}" }
+            # Creates a new Watch Service and registers ourself as a listener
+            # This isn't an OSGi service, but it's called by {WatchTriggerHandler} below.
+            def activate
+              java_path = java.nio.file.Path.of(@path.to_s)
+
+              service_name = WatchService::SERVICE_PID
+              filter = if @custom_watcher
+                         WatchHandler.factory.create_watch_service(@custom_watcher, java_path)
+                         logger.trace { "Created a watch service #{@custom_watcher} for #{@path}" }
+                         "(name=#{@custom_watcher})"
+                       else
+                         logger.trace { "Using configWatcher service for #{@path}" }
+                         WatchService::CONFIG_WATCHER_FILTER
+                       end
+
+              start = Time.now
+              sleep 0.1 until (@watch_service = OSGi.service(service_name, filter:)) || Time.now - start > 2
+
+              unless @watch_service
+                logger.warn("Watch service is not ready in time. #{@path} will not be monitored!")
+                return
               end
 
-              # Invoked by the WatchService when a watch event occurs
-              # @param [org.openhab.core.service.WatchService.Kind] kind WatchService event kind
-              # @param [java.nio.file.Path] path The path that had an event
-              def processWatchEvent(kind, path) # rubocop:disable Naming/MethodName
-                logger.trace { "processWatchEvent triggered #{path} #{kind} #{@types}" }
-                return unless @types.include?(kind)
-
-                # OH4 WatchService feeds us a relative path,
-                # but just in case its implementation changes in the future
-                path = path.absolute? ? Pathname.new(path.to_s) : @path + path.to_s
-                @block.call(Events::WatchEvent.new(EVENT_TO_SYMBOL[kind], path))
-              end
+              @watch_service.register_listener(self, java_path, @subdirs)
+              logger.trace { "Registered watch service listener for #{@path} including subdirs: #{@subdirs}" }
             end
-          else
-            # @deprecated OH3.4
-            #
-            # Extends the openHAB3 watch service to watch directories
-            #
-            # Must match java method name style
-            # rubocop:disable Naming/MethodName
-            class Watcher < org.openhab.core.service.AbstractWatchService
-              java_import java.nio.file.StandardWatchEventKinds
-
-              # Hash of event symbols as strings to map to NIO events
-              STRING_TO_EVENT = {
-                created: StandardWatchEventKinds::ENTRY_CREATE,
-                deleted: StandardWatchEventKinds::ENTRY_DELETE,
-                modified: StandardWatchEventKinds::ENTRY_MODIFY
-              }.transform_keys(&:to_s).freeze
-
-              # Hash of NIO event kinds to ruby symbols
-              EVENT_TO_SYMBOL = STRING_TO_EVENT.invert.transform_values(&:to_sym).freeze
-
-              # Creates a new Watch Service
-              def initialize(path, subdirs, types, &block)
-                super(path)
-                @types = types.map { |type| STRING_TO_EVENT[type] }
-                @block = block
-                @subdirs = subdirs
-              end
 
-              # Invoked by java super class to get type of events to watch for
-              # @param [String] _path ignored
-              #
-              # @return [Array] array of NIO event kinds
-              def getWatchEventKinds(_path)
-                @types
-              end
+            # Unregister ourself as a listener and remove the watch service
+            def deactivate
+              @watch_service&.unregister_listener(self)
+              return unless @custom_watcher
 
-              # Invoked by java super class to check if sub directories should be watched
-              # @return [false] false
-              def watchSubDirectories
-                logger.trace { "watchSubDirectories returning #{@subdirs}" }
-                @subdirs
-              end
+              WatchHandler.factory.remove_watch_service(@custom_watcher)
+              logger.trace { "Removed watch service #{@custom_watcher} for #{@path}" }
+            end
 
-              # Invoked by java super class when a watch event occurs
-              # @param [String] _event ignored
-              # @param [StandardWatchEventKind] kind NIO watch event kind
-              # @param [java.nio.file.Path] path that had an event
-              def processWatchEvent(_event, kind, path)
-                @block.call(Events::WatchEvent.new(EVENT_TO_SYMBOL[kind], Pathname.new(path.to_s)))
-              end
+            # Invoked by the WatchService when a watch event occurs
+            # @param [org.openhab.core.service.WatchService.Kind] kind WatchService event kind
+            # @param [java.nio.file.Path] path The path that had an event
+            def processWatchEvent(kind, path) # rubocop:disable Naming/MethodName
+              logger.trace { "processWatchEvent triggered #{path} #{kind} #{@types}" }
+              return unless @types.include?(kind)
+
+              # OH4 WatchService feeds us a relative path,
+              # but just in case its implementation changes in the future
+              path = path.absolute? ? Pathname.new(path.to_s) : @path + path.to_s
+              @block.call(Events::WatchEvent.new(EVENT_TO_SYMBOL[kind], path))
             end
-            # rubocop:enable Naming/MethodName
           end
 
           # Implements the openHAB TriggerHandler interface to process Watch Triggers

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

@@ -49,7 +49,7 @@ module OpenHAB
         # @return [SitemapBuilder]
         # @!visibility public
         def sitemap(name, label: nil, icon: nil, &block)
-          sitemap = SitemapBuilder.new(name, @builder_proxy, label: label, icon: icon, &block)
+          sitemap = SitemapBuilder.new(name, @builder_proxy, label:, icon:, &block)
           sitemap = sitemap.build
           if @update && @provider.get(sitemap.uid)
             @provider.update(sitemap)
@@ -67,9 +67,7 @@ module OpenHAB
         # 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
+        CONDITION_PATTERN = /(?>(?<item>[A-Za-z]\w*)?\s*(?<condition>==|!=|<=|>=|<|>))?\s*(?<sign>\+|-)?(?<state>.+)/
         private_constant :CONDITION_PATTERN
 
         # @return [String, nil]
@@ -242,7 +240,7 @@ module OpenHAB
 
         # @!visibility private
         def inspect
-          s = +"#<OpenHAB::DSL::Sitemaps::#{@type.capitalize}Builder "
+          s = "#<OpenHAB::DSL::Sitemaps::#{@type.capitalize}Builder "
           s << (instance_variables - [:@children]).map do |iv|
             "#{iv}=#{instance_variable_get(iv).inspect}"
           end.join(" ")
@@ -272,10 +270,6 @@ module OpenHAB
           return if conditions.empty?
 
           object = widget.send(method)
-          # @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.each do |sub_conditions|
             container = SitemapBuilder.factory.send(container_method)
@@ -287,9 +281,6 @@ module OpenHAB
         end
 
         def add_conditions_to_container(container, conditions)
-          # @deprecated OH 4.0
-          supports_and_conditions = SitemapBuilder.factory.respond_to?(:create_condition)
-
           Array.wrap(conditions).each do |c|
             c = c.to_s if c.is_a?(Core::Types::State)
             unless c.is_a?(String) || c.is_a?(Symbol)
@@ -299,12 +290,12 @@ module OpenHAB
               raise ArgumentError, "Syntax error in condition #{c.inspect} for #{inspect}"
             end
 
-            condition = supports_and_conditions ? SitemapBuilder.factory.create_condition : container
+            condition = SitemapBuilder.factory.create_condition
             condition.item = match["item"]
             condition.condition = match["condition"]
             condition.sign = match["sign"]
             condition.state = match["state"]
-            container.conditions.add(condition) if supports_and_conditions
+            container.conditions.add(condition)
           end
         end
       end
@@ -546,7 +537,7 @@ module OpenHAB
         # @return [String, nil]
         # @example
         #   "#.##" # => formats a number with two decimals.
-        # @see https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/text/DecimalFormat.html DecimalFormat
+        # @see java.text.DecimalFormat DecimalFormat
         attr_accessor :y_axis_pattern
 
         # (see WidgetBuilder#initialize)
@@ -809,7 +800,6 @@ module OpenHAB
                        stateless: nil,
                        **kwargs,
                        &block)
-
           super(:button, builder_proxy, **kwargs, &block)
 
           @row = row
@@ -1483,7 +1473,7 @@ module OpenHAB
         # @param icon [String, nil]
         # @!visibility private
         def initialize(name, builder_proxy, label: nil, icon: nil)
-          super(:sitemap, builder_proxy, label: label, icon: icon)
+          super(:sitemap, builder_proxy, label:, icon:)
 
           @name = name
         end

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

@@ -77,14 +77,14 @@ module OpenHAB
 
         # Create a new Bridge
         # @see BridgeBuilder#initialize
-        def bridge(*args, **kwargs, &block)
-          build(BridgeBuilder, *args, **kwargs, &block)
+        def bridge(...)
+          build(BridgeBuilder, ...)
         end
 
         # Create a new Thing
         # @see ThingBuilder#initialize
-        def thing(*args, **kwargs, &block)
-          build(ThingBuilder, *args, **kwargs, &block)
+        def thing(...)
+          build(ThingBuilder, ...)
         end
 
         private
@@ -287,14 +287,14 @@ module OpenHAB
 
         # Create a new Bridge with this Bridge as its Bridge
         # @see BridgeBuilder#initialize
-        def bridge(*args, **kwargs, &block)
-          parent_builder.bridge(*args, bridge: self, **kwargs, &block)
+        def bridge(*args, **kwargs, &)
+          parent_builder.bridge(*args, bridge: self, **kwargs, &)
         end
 
         # Create a new Thing with this Bridge as its Bridge
         # @see ThingBuilder#initialize
-        def thing(*args, **kwargs, &block)
-          parent_builder.thing(*args, bridge: self, **kwargs, &block)
+        def thing(*args, **kwargs, &)
+          parent_builder.thing(*args, bridge: self, **kwargs, &)
         end
       end
 

data/lib/openhab/dsl/timer_manager.rb

@@ -35,11 +35,11 @@ module OpenHAB
               old_timer.cancel!
               @timers.remove(old_timer)
             end
-            Core::Timer.new(duration, id: id, thread_locals: thread_locals, block: block)
+            Core::Timer.new(duration, id:, thread_locals:, block:)
           end
         end
 
-        Core::Timer.new(duration, id: id, thread_locals: thread_locals, block: block)
+        Core::Timer.new(duration, id:, thread_locals:, block:)
       end
 
       # Add a timer that is now active

data/lib/openhab/dsl/version.rb

@@ -4,6 +4,6 @@ module OpenHAB
   module DSL
     # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.35.1"
+    VERSION = "5.36.0"
   end
 end

data/lib/openhab/dsl.rb

@@ -2,7 +2,6 @@
 
 require "java"
 require "method_source"
-require "ruby2_keywords"
 
 require "bundler/inline"
 
@@ -10,7 +9,7 @@ require_relative "log"
 require_relative "osgi"
 require_relative "core"
 
-Dir[File.expand_path("dsl/**/*.rb", __dir__)].sort.each do |f|
+Dir[File.expand_path("dsl/**/*.rb", __dir__)].each do |f|
   require f
 end
 
@@ -59,38 +58,38 @@ module OpenHAB
 
     # (see Rules::Builder#rule)
     def rule(name = nil, id: nil, **kwargs, &block)
-      rules.build { rule(name, id: id, **kwargs, &block) }
+      rules.build { rule(name, id:, **kwargs, &block) }
     end
 
     # Creates a rule that will remove existing rules with the same id, even when the id has been inferred.
     # @see rule
     def rule!(name = nil, id: nil, **kwargs, &block)
-      rules.build { rule(name, id: id, replace: true, **kwargs, &block) }
+      rules.build { rule(name, id:, replace: true, **kwargs, &block) }
     end
 
     # (see Rules::Builder#scene)
     def scene(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
-      rules.build { scene(name, description: description, id: id, tag: tag, tags: tags, **kwargs, &block) }
+      rules.build { scene(name, description:, id:, tag:, tags:, **kwargs, &block) }
     end
 
     # Creates a scene that will remove existing rules/scenes with the same id, even when the id has been inferred.
     # @see scene
     def scene!(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
       rules.build do
-        scene(name, description: description, id: id, tag: tag, tags: tags, replace: true, **kwargs, &block)
+        scene(name, description:, id:, tag:, tags:, replace: true, **kwargs, &block)
       end
     end
 
     # (see Rules::Builder#script)
     def script(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
-      rules.build { script(name, description: description, id: id, tag: tag, tags: tags, **kwargs, &block) }
+      rules.build { script(name, description:, id:, tag:, tags:, **kwargs, &block) }
     end
 
     # Creates a script that will remove existing rules/scripts with the same id, even when the id has been inferred.
     # @see script
     def script!(name = nil, description: nil, id: nil, tag: nil, tags: nil, **kwargs, &block)
       rules.build do
-        script(name, description: description, id: id, tag: tag, tags: tags, replace: true, **kwargs, &block)
+        script(name, description:, id:, tag:, tags:, replace: true, **kwargs, &block)
       end
     end
 
@@ -198,7 +197,7 @@ module OpenHAB
       id = id.to_s
 
       ThreadLocal.thread_local(openhab_rule_type: "profile", openhab_rule_uid: id) do
-        Core::ProfileFactory.instance.register(id, block, label: label, type: type, config_description: config_description)
+        Core::ProfileFactory.instance.register(id, block, label:, type:, config_description:)
       end
     end
 
@@ -383,7 +382,7 @@ module OpenHAB
 
       # Carry rule name to timer
       thread_locals = ThreadLocal.persist
-      timers.create(duration, id: id, reschedule: reschedule, thread_locals: thread_locals, block: block)
+      timers.create(duration, id:, reschedule:, thread_locals:, block:)
     end
 
     #
@@ -444,7 +443,7 @@ module OpenHAB
       interval = binding.local_variable_get(:for)
       id ||= block.source_location
       DSL.debouncers.compute(id) do |_key, debouncer|
-        debouncer ||= Debouncer.new(for: interval, leading: leading, idle_time: idle_time)
+        debouncer ||= Debouncer.new(for: interval, leading:, idle_time:)
         debouncer.call(&block)
         debouncer
       end
@@ -482,7 +481,7 @@ module OpenHAB
     #
     def debounce_for(debounce_time, id: nil, &block)
       idle_time = debounce_time.is_a?(Range) ? debounce_time.begin : debounce_time
-      debounce(for: debounce_time, idle_time: idle_time, id: id, &block)
+      debounce(for: debounce_time, idle_time:, id:, &block)
     end
 
     #
@@ -514,7 +513,7 @@ module OpenHAB
     # @see Rules::BuilderDSL#throttle_for
     #
     def throttle_for(duration, id: nil, &block)
-      debounce(for: duration, id: id, &block)
+      debounce(for: duration, id:, &block)
     end
 
     # (see Core::Actions::Transformation.transform)
@@ -545,7 +544,7 @@ module OpenHAB
     #
     def only_every(interval, id: nil, &block)
       interval = 1.send(interval) if %i[second minute hour day].include?(interval)
-      debounce(for: interval, leading: true, id: id, &block)
+      debounce(for: interval, leading: true, id:, &block)
     end
 
     #
@@ -1057,7 +1056,7 @@ module OpenHAB
     # see OpenHAB::DSL::Rules::AutomationRule#execute!
     #
     # @!visibility private
-    ruby2_keywords def method_missing(method, *args)
+    def method_missing(method, *args)
       return super unless args.empty? && !block_given?
 
       if (context = Thread.current[:openhab_context]) && context.key?(method)

data/lib/openhab/log.rb

@@ -166,13 +166,13 @@ module OpenHAB
     #
     # Regex for matching internal calls in a stack trace
     #
-    INTERNAL_CALL_REGEX = %r{(openhab-scripting-.*/lib)|org[./]jruby}.freeze
+    INTERNAL_CALL_REGEX = %r{(openhab-scripting-.*/lib)|org[./]jruby}
     private_constant :INTERNAL_CALL_REGEX
 
     #
     # Regex for matching internal calls in a java stack trace
     #
-    EXCLUDED_JAVA_PACKAGES = /jdk\.internal\.reflect|java\.lang\.reflect|org\.openhab|java\.lang\.Thread\.run/.freeze
+    EXCLUDED_JAVA_PACKAGES = /jdk\.internal\.reflect|java\.lang\.reflect|org\.openhab|java\.lang\.Thread\.run/
     private_constant :EXCLUDED_JAVA_PACKAGES
 
     #
@@ -228,7 +228,7 @@ module OpenHAB
       #
       def def_level_method(level)
         define_method(level) do |msg = nil, &block|
-          log(severity: level, msg: msg, &block)
+          log(severity: level, msg:, &block)
         end
       end
 

data/lib/openhab/osgi.rb

@@ -13,7 +13,7 @@ module OpenHAB
       # @return [Object]
       #
       def service(name, filter: nil)
-        services(name, filter: filter).first
+        services(name, filter:).first
       end
 
       #

data/lib/openhab/rspec/helpers.rb

@@ -147,8 +147,8 @@ module OpenHAB
       #
       # @return [Object] The return value from the block.
       #
-      def suspend_rules(&block)
-        SuspendRules.suspend_rules(&block)
+      def suspend_rules(&)
+        SuspendRules.suspend_rules(&)
       end
 
       #
@@ -444,7 +444,7 @@ module OpenHAB
         50
       end
 
-      EMACS_MODELINE_REGEXP = /# -\*-(.+)-\*-/.freeze
+      EMACS_MODELINE_REGEXP = /# -\*-(.+)-\*-/
       private_constant :EMACS_MODELINE_REGEXP
 
       def parse_emacs_modeline(line)

data/lib/openhab/rspec/hooks.rb

@@ -80,14 +80,8 @@ module OpenHAB
         config.before do |example|
           # clear persisted thing status
           tm = Core::Things.manager
-          begin
-            tm.class.field_reader :disabledStorage
-            tm.disabledStorage.keys.each { |k| tm.disabledStorage.remove(k) } # rubocop:disable Style/HashEachMethods not a hash
-          rescue NameError
-            # @deprecated OH3.4
-            tm.class.field_reader :storage
-            tm.storage.keys.each { |k| tm.storage.remove(k) } # rubocop:disable Style/HashEachMethods not a hash
-          end
+          tm.class.field_reader :disabledStorage
+          tm.disabledStorage.keys.each { |k| tm.disabledStorage.remove(k) } # rubocop:disable Style/HashEachMethods -- not a hash
           @profile_factory = Core::ProfileFactory.send(:new)
           allow(Core::ProfileFactory).to receive(:instance).and_return(@profile_factory)
 

data/lib/openhab/rspec/jruby.rb

@@ -37,7 +37,7 @@ module OpenHAB
           if defined?(Java::OrgOsgiFramework::Bundle) && loader.is_a?(org.osgi.framework.Bundle)
             loader = OSGiBundleClassLoader.new(loader)
           end
-          super(loader)
+          super
         end
       end
       org.jruby.RubyInstanceConfig.prepend(InstanceConfig)