address copilot review

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>

Author: jimtng

bundles/org.openhab.io.yamlcomposer/README.md

@@ -37,7 +37,7 @@ For a general introduction to YAML, see [YAML Basics](doc/basics.md).
 
 ## Packaging Example
 
-**CONF/yamlcompose/LivingRoom.yaml:**
+**CONF/yamlcomposer/LivingRoom.yaml:**
 
 ```yaml
 version: 1
@@ -62,7 +62,7 @@ packages:
       <<: *LIGHT_VARS
 ```
 
-**CONF/yamlcompose/pkg/zigbee_light.inc.yaml:**
+**CONF/yamlcomposer/pkg/zigbee_light.inc.yaml:**
 
 ```yaml
 # This is the package file, i.e. the template for a zigbee light

bundles/org.openhab.io.yamlcomposer/doc/include.md

@@ -2,7 +2,7 @@
 
 `!include` inserts the referenced file or structure exactly at the position where the include appears.
 
-YAML Composer supports including external YAML files to facilitate modular, reusable, and maintainable configurations.****
+YAML Composer supports including external YAML files to facilitate modular, reusable, and maintainable configurations.
 This is especially useful for modular reuse, creating device [packages](packages.md), or separating concerns across multiple files.
 
 [[toc]]

bundles/org.openhab.io.yamlcomposer/doc/merge-keys.md

@@ -161,7 +161,7 @@ server:
   port: 8080
   <<: !if
     if: is_prod
-    value: { ssl: true, cache: true }
+    then: { ssl: true, cache: true }
 ```
 
 ### Substitution

bundles/org.openhab.io.yamlcomposer/src/main/java/org/openhab/io/yamlcomposer/internal/core/SourceLocator.java

@@ -13,6 +13,7 @@
 package org.openhab.io.yamlcomposer.internal.core;
 
 import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Scanner;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -56,7 +57,7 @@ public FilePosition findPosition(String... keys) {
             return FilePosition.empty();
         }
 
-        try (Scanner scanner = new Scanner(new ByteArrayInputStream(yamlBytes))) {
+        try (Scanner scanner = new Scanner(new ByteArrayInputStream(yamlBytes), StandardCharsets.UTF_8)) {
             int lineNumber = 1;
             int keyIndex = 0;
 

bundles/org.openhab.io.yamlcomposer/src/main/java/org/openhab/io/yamlcomposer/internal/expression/filters/DigFilter.java

@@ -23,7 +23,7 @@
 
 /**
  * Custom Jinjava filter to dig into nested maps/lists.
- * Supports negative indices for lists to acess elements from the end.
+ * Supports negative indices for lists to access elements from the end.
  *
  * Usage: variable|dig("key1", "key2", 0) to access variable["key1"]["key2"][0]
  * Also supports dot-notation in a single argument: variable|dig("key1.key2.0")

bundles/org.openhab.io.yamlcomposer/src/main/java/org/openhab/io/yamlcomposer/internal/processors/FragmentUtils.java

@@ -47,8 +47,9 @@ public static record Parameters(@Nullable String name, Map<String, @Nullable Obj
     }
 
     private static @Nullable Parameters parseMapParameters(Map<?, ?> paramsMap, String objectName) {
-        @Nullable
-        String name = (String) paramsMap.get(objectName);
+        if (!(paramsMap.get(objectName) instanceof String name)) {
+            return null;
+        }
         if (!(paramsMap.get("vars") instanceof Map<?, ?> varsMap)) {
             return new Parameters(name, Map.of());
         }
@@ -95,7 +96,7 @@ private static Parameters parseStringParameters(String input, String objectName)
         return new Parameters(finalName, vars);
     }
 
-    private static void parsePair(String input, int start, int end, Map<String, Object> vars) {
+    private static void parsePair(String input, int start, int end, Map<String, @Nullable Object> vars) {
         int eq = input.indexOf('=', start);
 
         // If eq is outside our current segment, there is no value