Warn when creating a tag that already exists (#181)

openhab · Oct 14, 2023 · 2515c24 · 2515c24
1 parent e07b20c
commit 2515c24
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/openhab/core/items/semantics.rb b/lib/openhab/core/items/semantics.rb
@@ -311,15 +311,18 @@ def add(label: nil, synonyms: "", description: "", **tags)
               synonyms = Array.wrap(synonyms).map { |s| s.to_s.strip }
 
               tags.map do |name, parent|
+                if (existing_tag = lookup(name))
+                  logger.warn("Tag already exists: #{existing_tag.inspect}")
+                  next
+                end
+
                 unless parent.is_a?(SemanticTag)
                   parent_tag = lookup(parent)
                   raise ArgumentError, "Unknown parent: #{parent}" unless parent_tag
 
                   parent = parent_tag
                 end
 
-                next if lookup(name)
-
                 new_tag = org.openhab.core.semantics.SemanticTagImpl.new("#{parent.uid}_#{name}",
                                                                          label,
                                                                          description,

diff --git a/spec/openhab/core/items/semantics_spec.rb b/spec/openhab/core/items/semantics_spec.rb
@@ -355,6 +355,12 @@ def points(*args)
         expect(Semantics.lookup("Syn1")).to be Semantics::ArraySynonyms
         expect(Semantics.lookup("Syn2")).to be Semantics::ArraySynonyms
       end
+
+      it "warns when trying to create a tag that already exists" do
+        Semantics.add(ExistingTag: Semantics::Equipment)
+        expect(Semantics.logger).to receive(:warn).with(/already exists/)
+        Semantics.add(ExistingTag: Semantics::Point)
+      end
     end
 
     describe "#remove" do