openhab-jrubyscripting 5.0.0.rc9 → 5.0.0.rc11

data/lib/openhab/core/events/item_command_event.rb

@@ -10,7 +10,7 @@ module OpenHAB
       # Adds methods to core openHAB ItemCommandEvent to make it more natural in Ruby
       class ItemCommandEvent < ItemEvent
         # @!attribute [r] command
-        # @return [Type] The command sent to the item.
+        # @return [Command] The command sent to the item.
         alias_method :command, :item_command
 
         # @!method refresh?

data/lib/openhab/core/events/item_state_changed_event.rb

@@ -14,26 +14,26 @@ module OpenHAB
         include ItemState
 
         #
-        # Check if state was == UNDEF
+        # Check if state was == {UNDEF}
         #
-        # @return [true,false] True if the state is UNDEF, false otherwise
+        # @return [true,false] True if the state is {UNDEF}, false otherwise
         #
         def was_undef?
           old_item_state == UNDEF
         end
 
         #
-        # Check if state was == NULL
+        # Check if state was == {NULL}
         #
-        # @return [true,false] True if the state is NULL, false otherwise
+        # @return [true,false] True if the state is {NULL}, false otherwise
         def was_null?
           old_item_state == NULL
         end
 
         #
-        # Check if state was defined (not UNDEF or NULL)
+        # Check if state was defined (not {UNDEF} or {NULL})
         #
-        # @return [true,false] True if state is not UNDEF or NULL
+        # @return [true,false] True if state is not {UNDEF} or {NULL}
         #
         def was?
           !old_item_state.is_a?(UnDefType)

data/lib/openhab/core/events/item_state_event.rb

@@ -8,26 +8,26 @@ module OpenHAB
       # Helpers common to {ItemStateEvent} and {ItemStateChangedEvent}.
       module ItemState
         #
-        # Check if the state == UNDEF
+        # Check if the state == {UNDEF}
         #
-        # @return [true,false] True if the state is UNDEF, false otherwise
+        # @return [true,false] True if the state is {UNDEF}, false otherwise
         #
         def undef?
           item_state == UNDEF
         end
 
         #
-        # Check if the state == NULL
+        # Check if the state == {NULL}
         #
-        # @return [true,false] True if the state is NULL, false otherwise
+        # @return [true,false] True if the state is {NULL}, false otherwise
         def null?
           item_state == NULL
         end
 
         #
-        # Check if the state is defined (not UNDEF or NULL)
+        # Check if the state is defined (not {UNDEF} or {NULL})
         #
-        # @return [true,false] True if state is not UNDEF or NULL
+        # @return [true,false] True if state is not {UNDEF} or {NULL}
         #
         def state?
           !item_state.is_a?(UnDefType)

data/lib/openhab/core/events/thing_status_info_event.rb

@@ -6,16 +6,18 @@ module OpenHAB
       java_import org.openhab.core.thing.events.ThingStatusInfoChangedEvent,
                   org.openhab.core.thing.events.ThingStatusInfoEvent
 
-      # The {AbstractEvent} sent when a {Things::Thing}'s status has changed.
+      #
+      # The {AbstractEvent} sent when a {Things::Thing Thing's} status has changed.
+      #
       class ThingStatusInfoChangedEvent < AbstractEvent
         # @!attribute [r] uid
-        # @return [Things::ThingUID] The UID of the [Things::Thing] that triggered this event.
+        # @return [Things::ThingUID] The UID of the {Things::Thing Thing} that triggered this event.
         alias_method :uid, :get_thing_uid
         # @!attribute [r] was
-        # @return [Things::ThingStatusInfo] The thing's prior status.
+        # @return [org.openhab.core.thing.ThingStatusInfo] The thing's prior status.
         alias_method :was, :get_old_status_info
         # @!attribute [r] status
-        # @return [Things::ThingStatusInfo] The thing's status.
+        # @return [org.openhab.core.thing.ThingStatusInfo] The thing's status.
         alias_method :status, :status_info
 
         #
@@ -31,12 +33,12 @@ module OpenHAB
       class ThingStatusInfoEvent < AbstractEvent
         #
         # @!attribute [r] uid
-        # @return [Things::ThingUID] The UID of the [Things::Thing] that triggered this event.
+        # @return [Things::ThingUID] The UID of the {Things::Thing Thing} that triggered this event.
         #
         alias_method :uid, :get_thing_uid
         #
         # @!attribute [r] status
-        # @return [Things::ThingStatusInfo] The thing's status.
+        # @return [org.openhab.core.thing.ThingStatusInfo] The thing's status.
         #
         alias_method :status, :status_info
 

data/lib/openhab/core/items/generic_item.rb

@@ -8,7 +8,7 @@ module OpenHAB
       #
       # The abstract base class for all items.
       #
-      # @see https://www.openhab.org/javadoc/latest/org/openhab/core/items/genericitem
+      # @see org.openhab.core.items.GenericItem
       #
       class GenericItem
         # @!parse include Item
@@ -49,6 +49,7 @@ module OpenHAB
         #   The item's descriptive label.
         #   @return [String, nil]
 
+        # @!visibility private
         alias_method :hash, :hash_code
 
         # @!attribute [r] raw_state

data/lib/openhab/core/items/persistence.rb

@@ -48,6 +48,8 @@ module OpenHAB
         # that state into a {QuantityType} as necessary.
         #
         class HistoricState < SimpleDelegator
+          # @!attribute [r] state
+          # @return [Types::State]
           alias_method :state, :__getobj__
 
           def initialize(state, historic_item)
@@ -70,8 +72,11 @@ module OpenHAB
                               variance_since].freeze
 
         # All persistence methods that require a timestamp
+        # Note the _between methods are automatically created from the _since methods
         PERSISTENCE_METHODS = (QUANTITY_METHODS +
                               %i[changed_since?
+                                 count_since
+                                 count_state_changes_since
                                  evolution_rate
                                  historic_state
                                  maximum_since
@@ -80,24 +85,24 @@ module OpenHAB
         private_constant :QUANTITY_METHODS, :PERSISTENCE_METHODS
 
         # @!method persist(service = nil)
-        #   Persist the state of the item
+        #   Persists the state of the item
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [void]
 
         # @!method last_update(service = nil)
-        #   Return the time the item was last updated.
+        #   Returns the time the item was last updated.
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [ZonedDateTime, nil] The timestamp of the last update
 
         # @!method average_since(timestamp, service = nil)
-        #   Return the average value of the item's state since the given time
+        #   Returns the average value of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [DecimalType, QuantityType, nil] The average value since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method average_between(start, finish, service = nil)
-        #   Return the average value of the item's state between two points in time
+        #   Returns the average value of the item's state between two points in time
         #   @param [#to_zoned_date_time] start The point in time from which to search
         #   @param [#to_zoned_date_time] finish The point in time to which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
@@ -105,14 +110,14 @@ module OpenHAB
         #     or nil if no previous state could be found.
 
         # @!method delta_since(timestamp, service = nil)
-        #   Return the difference value of the item's state since the given time
+        #   Returns the difference value of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [DecimalType, QuantityType, nil] The difference value since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method delta_between(start, finish, service = nil)
-        #   Return the difference value of the item's state between two points in time
+        #   Returns the difference value of the item's state between two points in time
         #   @param [#to_zoned_date_time] start The point in time from which to search
         #   @param [#to_zoned_date_time] finish The point in time to which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
@@ -120,14 +125,14 @@ module OpenHAB
         #     or nil if no previous state could be found.
 
         # @!method deviation_since(timestamp, service = nil)
-        #   Return the standard deviation of the item's state since the given time
+        #   Returns the standard deviation of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [DecimalType, QuantityType, nil] The standard deviation since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method deviation_between(start, finish, service = nil)
-        #   Return the standard deviation of the item's state between two points in time
+        #   Returns the standard deviation of the item's state between two points in time
         #   @param [#to_zoned_date_time] start The point in time from which to search
         #   @param [#to_zoned_date_time] finish The point in time to which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
@@ -135,14 +140,14 @@ module OpenHAB
         #     or nil if no previous state could be found.
 
         # @!method sum_since(timestamp, service = nil)
-        #   Return the sum of the item's state since the given time
+        #   Returns the sum of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [DecimalType, QuantityType, nil] The sum since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method sum_between(start, finish, service = nil)
-        #   Return the sum of the item's state between two points in time
+        #   Returns the sum of the item's state between two points in time
         #   @param [#to_zoned_date_time] start The point in time from which to search
         #   @param [#to_zoned_date_time] finish The point in time to which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
@@ -150,14 +155,14 @@ module OpenHAB
         #     or nil if no previous state could be found.
 
         # @!method variance_since(timestamp, service = nil)
-        #   Return the variance of the item's state since the given time
+        #   Returns the variance of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [DecimalType, QuantityType, nil] The variance since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method variance_between(start, finish, service = nil)
-        #   Return the variance of the item's state between two points in time
+        #   Returns the variance of the item's state between two points in time
         #   @param [#to_zoned_date_time] start The point in time from which to search
         #   @param [#to_zoned_date_time] finish The point in time to which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
@@ -178,28 +183,28 @@ module OpenHAB
         #   @return [true,false] True if the item's state changed between `start` and `finish`, False otherwise.
 
         # @!method evolution_rate(timestamp, service = nil)
-        #   Return the evolution rate of the item's state since the given time
+        #   Returns the evolution rate of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [DecimalType, QuantityType, nil] The evolution rate since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method historic_state(timestamp, service = nil)
-        #   Return the the item's state at the given time
+        #   Returns the the item's state at the given time
         #   @param [#to_zoned_date_time] timestamp The point in time at which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [HistoricState, nil] The item's state at `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method maximum_since(timestamp, service = nil)
-        #   Return the maximum value of the item's state since the given time
+        #   Returns the maximum value of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [HistoricState, nil] The maximum value since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method maximum_between(start, finish, service = nil)
-        #   Return the maximum value of the item's state between two points in time
+        #   Returns the maximum value of the item's state between two points in time
         #   @param [#to_zoned_date_time] start The point in time from which to search
         #   @param [#to_zoned_date_time] finish The point in time to which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
@@ -207,14 +212,14 @@ module OpenHAB
         #     or nil if no previous state could be found.
 
         # @!method minimum_since(timestamp, service = nil)
-        #   Return the minimum value of the item's state since the given time
+        #   Returns the minimum value of the item's state since the given time
         #   @param [#to_zoned_date_time] timestamp The point in time from which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [HistoricState, nil] The minimum value since `timestamp`,
         #     or nil if no previous state could be found.
 
         # @!method minimum_between(start, finish, service = nil)
-        #   Return the minimum value of the item's state between two points in time
+        #   Returns the minimum value of the item's state between two points in time
         #   @param [#to_zoned_date_time] start The point in time from which to search
         #   @param [#to_zoned_date_time] finish The point in time to which to search
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
@@ -234,6 +239,32 @@ module OpenHAB
         #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
         #   @return [true,false] True if the item's state was updated between `start` and `finish`, False otherwise.
 
+        # @!method count_since(timestamp, service = nil)
+        #   Returns the number of available historic data points from a point in time until now.
+        #   @param [#to_zoned_date_time] timestamp The point in time from which to search
+        #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
+        #   @return [Integer] The number of values persisted for this item.
+
+        # @!method count_between(start, finish, service = nil)
+        #   Returns the number of available historic data points between two points in time.
+        #   @param [#to_zoned_date_time] start The point in time from which to search
+        #   @param [#to_zoned_date_time] finish The point in time to which to search
+        #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
+        #   @return [Integer] The number of values persisted for this item.
+
+        # @!method count_state_changes_since(timestamp, service = nil)
+        #   Returns the number of changes in historic data points from a point in time until now.
+        #   @param [#to_zoned_date_time] timestamp The point in time from which to search
+        #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
+        #   @return [Integer] The number of values persisted for this item.
+
+        # @!method count_state_changes_between(start, finish, service = nil)
+        #   Returns the number of changes in historic data points between two points in time.
+        #   @param [#to_zoned_date_time] start The point in time from which to search
+        #   @param [#to_zoned_date_time] finish The point in time to which to search
+        #   @param [Symbol, String] service An optional persistence id instead of the default persistence service.
+        #   @return [Integer] The number of values persisted for this item.
+
         %i[persist last_update].each do |method|
           define_method(method) do |service = nil|
             service ||= persistence_service
@@ -286,6 +317,9 @@ module OpenHAB
           end
         end
 
+        alias_method :state_changes_since, :count_state_changes_since
+        alias_method :state_changes_between, :count_state_changes_between
+
         private
 
         #

data/lib/openhab/core/items/player_item.rb

@@ -16,7 +16,7 @@ module OpenHAB
       # @example Start playing on a player item
       #   Chromecast.play
       # @example Check if a player is paused
-      #   logger.warn("#{item.name} is paused) if Chromecast.paused?
+      #   logger.warn("#{item.name} is paused") if Chromecast.paused?
       #
       class PlayerItem < GenericItem
         # @!method play?

data/lib/openhab/core/items/proxy.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "delegate"
+require_relative "../proxy"
 
 module OpenHAB
   module Core
@@ -11,6 +12,13 @@ module OpenHAB
         # Not really an Item, but pretends to be
         # @!parse include Item
 
+        # @!visibility private
+        EVENTS = [Events::ItemAddedEvent::TYPE, Events::ItemUpdatedEvent::TYPE, Events::ItemRemovedEvent::TYPE].freeze
+        # @!visibility private
+        UID_METHOD = :name
+
+        include Core::Proxy
+
         # @return [String]
         attr_reader :name
 
@@ -18,19 +26,15 @@ module OpenHAB
         # Set the proxy item (called by super)
         #
         def __setobj__(item)
-          @name = item.name
-          # Convert name to Java version for faster lookups
-          @java_name = item.name.to_java
+          @item = item.is_a?(Item) ? item : nil
+          @name ||= item.name if item
         end
 
         #
-        # Lookup item from item registry
+        # @return [Item, nil]
         #
         def __getobj__
-          r = $ir.get(@name)
-          return yield if r.nil? && block_given?
-
-          r
+          @item
         end
 
         # @return [Module]
@@ -88,9 +92,9 @@ module OpenHAB
         # @return [GroupItem::Members]
         # @raise [NoMethodError] if item is not a GroupItem, or a dummy.
         def members
-          return super unless __getobj__.nil?
+          return GroupItem::Members.new(self) if __getobj__.nil?
 
-          GroupItem::Members.new(self)
+          __getobj__.members
         end
 
         # @return [String]
@@ -112,15 +116,17 @@ module OpenHAB
         end
 
         # needs to return `false` if we know we're not a {GroupItem}
-        def respond_to?(method, *)
-          return __getobj__.nil? if method.to_sym == :members
+        def respond_to?(method, *args)
+          obj = __getobj__
+          return obj.respond_to?(method, *args) if method.to_sym == :members && !obj.nil?
 
           super
         end
 
         # needs to return `false` if we know we're not a {GroupItem}
-        def respond_to_missing?(method, *)
-          return __getobj__.nil? if method.to_sym == :members
+        def respond_to_missing?(method, *args)
+          obj = __getobj__
+          return obj.respond_to_missing?(method, *args) if method.to_sym == :members && !obj.nil?
 
           super
         end

data/lib/openhab/core/items/registry.rb

@@ -48,6 +48,8 @@ module OpenHAB
         # @yield Block executed in the context of a {DSL::Items::Builder}
         # @return [Object] The return value of the block.
         #
+        # (see Items::Builder)
+        #
         def build(preferred_provider = nil, &block)
           DSL::Items::BaseBuilderDSL.new(preferred_provider).instance_eval_with_dummy_items(&block)
         end

data/lib/openhab/core/items.rb

@@ -62,9 +62,9 @@ module OpenHAB
 
             logger.trace("Defining #{klass}##{command} for #{value}")
             klass.class_eval <<~RUBY, __FILE__, __LINE__ + 1
-              def #{command}(for: nil, on_expire: nil, &block)                                          # def on(for: nil, on_expire: nil, &block )
-                command(#{value}, for: binding.local_variable_get(:for), on_expire: on_expire, &block)  #   command(ON, for: nil, expire: nil, &block)
-              end                                                                                       # end
+              ruby2_keywords def #{command}(*args, &block)  # ruby2_keywords def on(*args, &block)
+                command(#{value}, *args, &block)            #   command(ON, *args, &block)
+              end                                           # end
             RUBY
 
             logger.trace("Defining Enumerable##{command} for #{value}")

data/lib/openhab/core/profile_factory.rb

@@ -69,10 +69,12 @@ module OpenHAB
 
           params[:callback] = @callback
           params[:context] = @context
-          params[:config] = @context.configuration
+          params[:configuration] = @context.configuration.properties
           params[:link] = @callback.link
           params[:item] = @callback.link.item
           params[:channel_uid] = @callback.link.linked_uid
+          params[:state] ||= nil
+          params[:command] ||= nil
 
           kwargs = {}
           @block.parameters.each do |(param_type, name)|

data/lib/openhab/core/proxy.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require "singleton"
+require "weakref"
+
+require_relative "script_handling"
+
+module OpenHAB
+  module Core
+    #
+    # Contains the infrastructure necessary to listen for events when objects are
+    # added/removed from their registry, and keep Proxy objects up-to-date with
+    # their underlying object.
+    #
+    # The including class must meet a few requirements:
+    #  * Have an `EVENTS` constant that is an Array<String> of the events to
+    #    listen for
+    #  * The _last_ entry in the `EVENTS` array must be the "removed" event
+    #  * It must have a sibling class called `Provider`, with a `.registry`
+    #    method
+    #  * It's parent module, downcased and with trailing "s" stripped, must be
+    #    the method name to retrieve an object from one of the incoming events
+    #
+    # @!visibility private
+    #
+    module Proxy
+      #
+      # Registers and listens to openHAB bus events for objects getting
+      # added/updated/removed, and updates references from proxy objects
+      # to real objects.
+      #
+      # Proxies are tracked (via a WeakRef), and their underlying object is
+      # if it has changed.
+      #
+      class EventSubscriber
+        include Singleton
+        include org.openhab.core.events.EventSubscriber
+
+        def initialize
+          @proxies = java.util.concurrent.ConcurrentHashMap.new
+          @parent_module = Object.const_get(self.class.name.split("::")[0..-3].join("::"), false)
+          @object_type = @parent_module.name.split("::").last.downcase[0..-2].to_sym
+
+          @event_types = @parent_module::Proxy::EVENTS
+          @uid_method = @parent_module::Proxy::UID_METHOD
+          @registry = @parent_module::Provider.registry
+          @registration = OSGi.register_service(self, "event.topics": "openhab/*")
+          ScriptHandling.script_unloaded { @registration.unregister }
+        end
+
+        #
+        # @!attribute [r] subscribed_event_types
+        # @return [Set<String>]
+        #
+        def subscribed_event_types
+          @event_types.to_set
+        end
+
+        # @return [org.openhab.core.events.EventFilter, nil]
+        def event_filter
+          nil
+        end
+
+        #
+        # @param [Events::AbstractEvent] event
+        # @return [void]
+        #
+        def receive(event)
+          uid = event.__send__(@object_type).__send__(@uid_method)
+          object = @registry.get(uid) unless event.class.simple_name == @event_types.last
+
+          @proxies.compute_if_present(uid) do |_, proxy_ref|
+            proxy = resolve_ref(proxy_ref)
+            next nil unless proxy
+
+            proxy.__setobj__(object)
+            proxy_ref
+          end
+        end
+
+        #
+        # Get or create a Proxy for the given raw openHAB object.
+        #
+        def fetch(object)
+          result = nil
+
+          @proxies.compute(object.__send__(@uid_method)) do |_k, proxy_ref|
+            result = resolve_ref(proxy_ref)
+            proxy_ref = nil unless result
+            result ||= yield
+
+            proxy_ref || WeakRef.new(result)
+          end
+
+          result
+        end
+
+        private
+
+        def resolve_ref(proxy_ref)
+          proxy_ref.__getobj__ if proxy_ref&.weakref_alive?
+        rescue WeakRef::RefError
+          nil
+        end
+      end
+
+      # @!visibility private
+      module ClassMethods
+        # Intercepts calls to create new proxies, and returns the already
+        # existing (and tracked) proxy if it exists. Otherwise it does create
+        # a new instance of Proxy.
+        def new(object)
+          self::EventSubscriber.instance.fetch(object) { super }
+        end
+      end
+
+      # @!visibility private
+      def self.included(klass)
+        klass.singleton_class.prepend(ClassMethods)
+        # define a sub-class of EventSubscriber as a child class of the including class
+        klass.const_set(:EventSubscriber, Class.new(EventSubscriber))
+      end
+    end
+  end
+end

data/lib/openhab/core/things/links/provider.rb

@@ -17,7 +17,7 @@ module OpenHAB
             #
             # The ItemChannelLink registry
             #
-            # @return [org.openhab.core.thing.link.ItemChanneLinkRegistry]
+            # @return [org.openhab.core.thing.link.ItemChannelLinkRegistry]
             #
             def registry
               @registry ||= OSGi.service("org.openhab.core.thing.link.ItemChannelLinkRegistry")

data/lib/openhab/core/things/proxy.rb

@@ -12,6 +12,14 @@ module OpenHAB
         extend Forwardable
         def_delegators :__getobj__, :class, :is_a?, :kind_of?
 
+        # @!visibility private
+        EVENTS = [Events::ThingAddedEvent::TYPE, Events::ThingUpdatedEvent::TYPE,
+                  Events::ThingRemovedEvent::TYPE].freeze
+        # @!visibility private
+        UID_METHOD = :uid
+
+        include Core::Proxy
+
         # Returns the list of channels associated with this Thing
         #
         # @note This is defined on this class, and not on {Thing}, because

data/lib/openhab/core/types/date_time_type.rb

@@ -33,7 +33,7 @@ module OpenHAB
 
         class << self
           #
-          # Parses a String representing a time into an {java.time.DateTimeType}. First tries to parse it
+          # Parses a String representing a time into a {DateTimeType}. First tries to parse it
           #   using Java's parser, then falls back to the Ruby `Time.parse`.
           #
           # @param [String] time_string
@@ -71,6 +71,7 @@ module OpenHAB
         def_delegator :zoned_date_time, :to_epoch_second, :to_i
         def_delegator :zoned_date_time, :to_time
 
+        # @!visibility private
         alias_method :day, :mday
 
         #

data/lib/openhab/core/types/decimal_type.rb

@@ -11,7 +11,7 @@ module OpenHAB
       DecimalType = org.openhab.core.library.types.DecimalType
 
       #
-      # {DecimalType} uses a {java.lang.BigDecimal} internally and thus can be
+      # {DecimalType} uses a {java.math.BigDecimal} internally and thus can be
       # used for integers, longs and floating point numbers alike.
       #
       # @example DecimalType can be used in case statements with ranges