Allow profiles to access the entire context of the link they're appli…

…ed to So that they can vary their processing based on the item or channeluid itself, instead of (or in addition to) solely on the prior states passing through it. Signed-off-by: Cody Cutrer <cody@cutrer.us>
openhab · Nov 7, 2022 · e8f3d3b · e8f3d3b
1 parent 2bceba6
commit e8f3d3b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/...penhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java b/...penhab.core.thing/src/main/java/org/openhab/core/thing/internal/CommunicationManager.java
@@ -297,8 +297,8 @@ private String normalizeProfileName(String profileName) {
         if (item != null && thing != null) {
             Channel channel = thing.getChannel(link.getLinkedUID());
             if (channel != null) {
-                context = new ProfileContextImpl(link.getConfiguration(), item.getAcceptedDataTypes(),
-                        item.getAcceptedCommandTypes(), acceptedCommandTypeMap.getOrDefault(
+                context = new ProfileContextImpl(link, item.getAcceptedDataTypes(), item.getAcceptedCommandTypes(),
+                        acceptedCommandTypeMap.getOrDefault(
                                 Objects.requireNonNullElse(channel.getAcceptedItemType(), ""), List.of()));
             }
         }

diff --git a/....openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java b/....openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ProfileContextImpl.java
@@ -17,7 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.common.ThreadPoolManager;
-import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.link.ItemChannelLink;
 import org.openhab.core.thing.profiles.ProfileContext;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
@@ -32,28 +32,24 @@
 public class ProfileContextImpl implements ProfileContext {
 
     private static final String THREAD_POOL_NAME = "profiles";
-    private final Configuration configuration;
+    private final ItemChannelLink link;
 
     private final List<Class<? extends State>> acceptedDataTypes;
     private final List<Class<? extends Command>> acceptedCommandTypes;
     private final List<Class<? extends Command>> handlerAcceptedCommandTypes;
 
-    public ProfileContextImpl(Configuration configuration) {
-        this(configuration, List.of(), List.of(), List.of());
-    }
-
-    public ProfileContextImpl(Configuration configuration, List<Class<? extends State>> acceptedDataTypes,
+    public ProfileContextImpl(ItemChannelLink link, List<Class<? extends State>> acceptedDataTypes,
             List<Class<? extends Command>> acceptedCommandTypes,
             List<Class<? extends Command>> handlerAcceptedCommandTypes) {
-        this.configuration = configuration;
+        this.link = link;
         this.acceptedDataTypes = acceptedDataTypes;
         this.acceptedCommandTypes = acceptedCommandTypes;
         this.handlerAcceptedCommandTypes = handlerAcceptedCommandTypes;
     }
 
     @Override
-    public Configuration getConfiguration() {
-        return configuration;
+    public ItemChannelLink getLink() {
+        return link;
     }
 
     @Override

diff --git a/.../org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java b/.../org.openhab.core.thing/src/main/java/org/openhab/core/thing/profiles/ProfileContext.java
@@ -17,6 +17,7 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.link.ItemChannelLink;
 import org.openhab.core.types.Command;
 import org.openhab.core.types.State;
 
@@ -30,13 +31,21 @@
  */
 @NonNullByDefault
 public interface ProfileContext {
+    /**
+     * Get the link between the item and the thing that this profile is applied to.
+     * 
+     * @return the link
+     */
+    ItemChannelLink getLink();
 
     /**
-     * Get the profile's configuration object
+     * Get the profile's configuration object.
      *
      * @return the configuration
      */
-    Configuration getConfiguration();
+    default Configuration getConfiguration() {
+        return getLink().getConfiguration();
+    }
 
     /**
      * Get a scheduler to be used within profiles (if needed at all)