Merge branch 'main' into fileformat_transform_things_new

Author: lolodomo

.github/dependabot.yml

@@ -17,5 +17,6 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
-    labels:
-      - dependencies
+    labels: [ ]
+    allow:
+      - dependency-type: "development"

.github/workflows/ci-build.yml

@@ -11,10 +11,12 @@ on:
       - 'main'
     paths-ignore:
       - '.github/**/*.md'
+    types: [opened,synchronize,reopened,labeled]
   workflow_dispatch:
 
 jobs:
   build:
+    if: ${{ (github.event_name == 'pull_request' && github.event.action != 'labeled') || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event.label.name == 'rebuild' }}
     strategy:
       fail-fast: false
       matrix:
@@ -181,3 +183,11 @@ jobs:
           title: CheckStyle Violations
           path: '**/checkstyle-result.xml'
           mode: inline
+
+      - name: Remove Label
+        if: ${{ always() && github.event.label.name == 'rebuild' }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR: ${{ github.event.number }}
+        run: |
+          gh pr edit $PR --remove-label rebuild

bundles/org.openhab.core.io.http.auth/pages/authorize.html

@@ -114,7 +114,7 @@
 			<input class="field" type="{repeatPasswordFieldType}" placeholder="{repeatPasswordPlaceholder}" name="password_repeat" />
 		</div>
 		<div>
-			<input class="field" type="{tokenNameFieldType}" placeholder="{tokenNamePlaceholder}" name="token_name" />
+			<input class="field" type="{tokenNameFieldType}" placeholder="{tokenNamePlaceholder}" name="token_name" required pattern="[a-zA-Z0-9]+" />
 		</div>
 		<div>
 			<input class="field" type="{tokenScopeFieldType}" placeholder="{tokenScopePlaceholder}" name="token_scope" />

bundles/org.openhab.core.io.http.auth/src/main/resources/messages.properties

@@ -16,7 +16,7 @@ auth.placeholder.username = User Name
 auth.placeholder.password = Password
 auth.placeholder.newpassword = New Password
 auth.placeholder.repeatpassword = Confirm New Password
-auth.placeholder.tokenname = Token Name
+auth.placeholder.tokenname = Token Name (alphanumeric)
 auth.placeholder.tokenscope = Token Scope (optional)
 
 auth.button.signin = Sign In

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

@@ -94,6 +94,8 @@ public class YamlModelRepositoryImpl implements WatchService.WatchEventListener,
             getElementName(YamlThingDTO.class) // "things"
     );
 
+    private static final String UNWANTED_EXCEPTION_TEXT = "at [Source: UNKNOWN; byte offset: #UNKNOWN] ";
+
     private final Logger logger = LoggerFactory.getLogger(YamlModelRepositoryImpl.class);
 
     private final WatchService watchService;
@@ -750,8 +752,9 @@ private <T extends YamlElement> Optional<T> parseJsonNode(JsonNode node, Class<T
             return Optional.of(objectMapper.treeToValue(node, elementClass));
         } catch (JsonProcessingException e) {
             if (errors != null) {
+                String msg = e.getMessage();
                 errors.add("Could not parse element %s to %s: %s".formatted(node.toPrettyString(),
-                        elementClass.getSimpleName(), e.getMessage()));
+                        elementClass.getSimpleName(), msg == null ? "" : msg.replace(UNWANTED_EXCEPTION_TEXT, "")));
             }
             return Optional.empty();
         }
@@ -784,8 +787,10 @@ private <T extends YamlElement> List<T> parseJsonMapNode(@Nullable JsonNode mapN
                         elt.setId(id);
                     } catch (JsonProcessingException e) {
                         if (errors != null) {
+                            String msg = e.getMessage();
                             errors.add("could not parse element with ID %s to %s: %s".formatted(id,
-                                    elementClass.getSimpleName(), e.getMessage()));
+                                    elementClass.getSimpleName(),
+                                    msg == null ? "" : msg.replace(UNWANTED_EXCEPTION_TEXT, "")));
                         }
                     }
                 }

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

@@ -241,8 +241,7 @@ public void updatedModel(String modelName, Collection<YamlThingDTO> elements) {
     @Override
     public void removedModel(String modelName, Collection<YamlThingDTO> elements) {
         List<Thing> removed = elements.stream().map(this::mapThing).filter(Objects::nonNull).toList();
-        Collection<Thing> modelThings = Objects
-                .requireNonNull(thingsMap.computeIfAbsent(modelName, k -> new ArrayList<>()));
+        Collection<Thing> modelThings = thingsMap.getOrDefault(modelName, List.of());
         removed.forEach(t -> {
             modelThings.stream().filter(th -> th.getUID().equals(t.getUID())).findFirst().ifPresentOrElse(oldThing -> {
                 modelThings.remove(oldThing);
@@ -252,6 +251,9 @@ public void removedModel(String modelName, Collection<YamlThingDTO> elements) {
                 }
             }, () -> logger.debug("model {} thing {} not found", modelName, t.getUID()));
         });
+        if (modelThings.isEmpty()) {
+            thingsMap.remove(modelName);
+        }
     }
 
     @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC)
@@ -373,8 +375,7 @@ private List<Channel> createChannels(ThingTypeUID thingTypeUID, ThingUID thingUI
             Map<String, YamlChannelDTO> channelsDto, List<ChannelDefinition> channelDefinitions) {
         Set<String> addedChannelIds = new HashSet<>();
         List<Channel> channels = new ArrayList<>();
-        channelsDto.entrySet().forEach(entry -> {
-            YamlChannelDTO channelDto = entry.getValue();
+        channelsDto.forEach((channelId, channelDto) -> {
             ChannelTypeUID channelTypeUID = null;
             ChannelKind kind = channelDto.getKind();
             String itemType = channelDto.getItemType();
@@ -402,11 +403,11 @@ private List<Channel> createChannels(ThingTypeUID thingTypeUID, ThingUID thingUI
                 }
             }
 
-            Channel channel = ChannelBuilder.create(new ChannelUID(thingUID, entry.getKey()), itemType).withKind(kind)
+            Channel channel = ChannelBuilder.create(new ChannelUID(thingUID, channelId), itemType).withKind(kind)
                     .withConfiguration(configuration).withType(channelTypeUID).withLabel(label)
                     .withAutoUpdatePolicy(autoUpdatePolicy).build();
             channels.add(channel);
-            addedChannelIds.add(entry.getKey());
+            addedChannelIds.add(channelId);
         });
 
         channelDefinitions.forEach(channelDef -> {