YAML model repository: supports only version 1 with elements as map (#4807)

* YAML model repository: supports only version 1 with elements as map

Signed-off-by: Laurent Garnier <lg.hc@free.fr>

Author: lolodomo

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/YamlModelRepositoryImpl.java

@@ -12,7 +12,6 @@
  */
 package org.openhab.core.model.yaml.internal;
 
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -25,19 +24,12 @@
  * The {@link YamlModelWrapper} is used to store the information read from a model in the model cache.
  *
  * @author Jan N. Klug - Initial contribution
- * @author Laurent Garnier - Introduce version 2 using map instead of table
+ * @author Laurent Garnier - Map used instead of table
  */
 @NonNullByDefault
 public class YamlModelWrapper {
     private final int version;
     private final boolean readOnly;
-    /**
-     * Nodes as a list in version 1
-     */
-    private final Map<String, List<JsonNode>> nodesV1 = new ConcurrentHashMap<>();
-    /**
-     * Nodes as a map in version >= 2
-     */
     private final Map<String, @Nullable JsonNode> nodes = new ConcurrentHashMap<>();
 
     public YamlModelWrapper(int version, boolean readOnly) {
@@ -53,20 +45,6 @@ public boolean isReadOnly() {
         return readOnly;
     }
 
-    /**
-     * Get the nodes for version 1
-     *
-     * @return the nodes
-     */
-    public Map<String, List<JsonNode>> getNodesV1() {
-        return nodesV1;
-    }
-
-    /**
-     * Get the nodes for version >= 2
-     *
-     * @return the nodes
-     */
     public Map<String, @Nullable JsonNode> getNodes() {
         return nodes;
     }

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/YamlModelWrapper.java

@@ -157,7 +157,7 @@ public Class<YamlThingDTO> getElementClass() {
 
     @Override
     public boolean isVersionSupported(int version) {
-        return version >= 2;
+        return version >= 1;
     }
 
     @Override

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/things/YamlThingProvider.java

@@ -1,12 +1,12 @@
 version: 1
 readOnly: false
 firstType:
-  - uid: element1
+  element1:
     description: description1
-  - uid: element2
+  element2:
     description: description2
-  - uid: element3
+  element3:
     description: description3
 secondType:
-  - id: elt1
+  elt1:
     label: My label

bundles/org.openhab.core.model.yaml/src/test/java/org/openhab/core/model/yaml/internal/YamlModelRepositoryImplTest.java

@@ -6,23 +6,20 @@ version: 1
 # known first type
 firstType:
   # a valid element with uid and description
-  - uid: First1
+  First1:
     description: Description1
 
   # a valid element with uid only
-  - uid: First2
-
-  # an invalid element (missing uid)
-  - description: Description3
+  First2:
 
 # known second type
 secondType:
   # a valid element with id and label
-  - id: Second1
+  Second1:
     label: Label1
 
 # unknown third type
 thirdType:
-  - foo: Bar
+  Foobar:
 
 nonArrayElement: Test

bundles/org.openhab.core.model.yaml/src/test/resources/model/addToModelExpectedContent.yaml

@@ -3,9 +3,9 @@
 version: 1
 
 firstType:
-  - uid: First
+  First:
     description: First original
-  - uid: Second
+  Second:
     description: Second original
-  - uid: Third
+  Third:
     description: Third original

bundles/org.openhab.core.model.yaml/src/test/resources/model/addToModelV2ExpectedContent.yaml

@@ -3,9 +3,9 @@
 version: 1
 
 firstType:
-  - uid: First
+  First:
     description: First original
-  - uid: Second
+  Second:
     description: Second modified
-  - uid: Fourth
+  Fourth:
     description: Fourth original

bundles/org.openhab.core.model.yaml/src/test/resources/model/modelFileAddedOrRemoved.yaml

@@ -1,4 +1,3 @@
 # A YAML test file for updating the model
 
 version: 1
-

bundles/org.openhab.core.model.yaml/src/test/resources/model/modelFileUpdatePost.yaml

@@ -3,9 +3,9 @@
 # version: 1 => removed in this update
 
 firstType:
-  - uid: First
+  First:
     description: First original
-  - uid: Second
+  Second:
     description: Second original
-  - uid: Third
+  Third:
     description: Third original

bundles/org.openhab.core.model.yaml/src/test/resources/model/modelFileUpdatePre.yaml

@@ -3,9 +3,9 @@
 version: 1
 
 firstTypeRenamed:
-  - uid: First
+  First:
     description: First original
-  - uid: Second
+  Second:
     description: Second original
-  - uid: Third
+  Third:
     description: Third original

bundles/org.openhab.core.model.yaml/src/test/resources/model/modelFileUpdateRemovedElements.yaml

@@ -1,7 +1,7 @@
 version: 1
 readOnly: false
 firstType:
-  - uid: element1
+  element1:
     description: description1
-  - uid: element2
+  element2:
     description: description2

bundles/org.openhab.core.model.yaml/src/test/resources/model/modelFileUpdateRemovedVersion.yaml

@@ -1,5 +1,5 @@
 version: 1
 readOnly: false
 firstType:
-  - uid: element2
+  element2:
     description: description2

bundles/org.openhab.core.model.yaml/src/test/resources/model/modelFileUpdateRenamedElements.yaml

@@ -1,7 +1,7 @@
 version: 1
 readOnly: false
 firstType:
-  - uid: element1
+  element1:
     description: newDescription1
-  - uid: element2
+  element2:
     description: description2