demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 19:55:48 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Normalize thing configuration before initialization (#3024)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2022-09-20 22:15:24 +02:00 committed by GitHub
parent e3b90e32ce
commit 0f82c38eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/ThingManagerImpl.java
View File

@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
@ -43,6 +44,7 @@ import org.openhab.core.common.registry.ManagedProvider;
import org.openhab.core.common.registry.Provider; import org.openhab.core.common.registry.Provider;
import org.openhab.core.config.core.ConfigDescription; import org.openhab.core.config.core.ConfigDescription;
import org.openhab.core.config.core.ConfigDescriptionRegistry; import org.openhab.core.config.core.ConfigDescriptionRegistry;
import org.openhab.core.config.core.ConfigUtil;
import org.openhab.core.config.core.Configuration; import org.openhab.core.config.core.Configuration;
import org.openhab.core.config.core.validation.ConfigDescriptionValidator; import org.openhab.core.config.core.validation.ConfigDescriptionValidator;
import org.openhab.core.config.core.validation.ConfigValidationException; import org.openhab.core.config.core.validation.ConfigValidationException;
@ -608,6 +610,7 @@ public class ThingManagerImpl
@SuppressWarnings("PMD.CompareObjectsWithEquals") @SuppressWarnings("PMD.CompareObjectsWithEquals")
public void thingUpdated(Thing oldThing, Thing newThing, ThingTrackerEvent thingTrackerEvent) { public void thingUpdated(Thing oldThing, Thing newThing, ThingTrackerEvent thingTrackerEvent) {
ThingUID thingUID = newThing.getUID(); ThingUID thingUID = newThing.getUID();
normalizeThingConfiguration(newThing);
if (thingUpdatedLock.contains(thingUID)) { if (thingUpdatedLock.contains(thingUID)) {
// called from the thing handler itself, therefore // called from the thing handler itself, therefore
// it exists, is initializing/initialized and // it exists, is initializing/initialized and
@ -851,6 +854,44 @@ public class ThingManagerImpl
configDescriptionValidator.validate(configuration.getProperties(), configDescriptionURI); configDescriptionValidator.validate(configuration.getProperties(), configDescriptionURI);
} }
private void normalizeThingConfiguration(Thing thing) throws ConfigValidationException {
ThingType thingType = thingTypeRegistry.getThingType(thing.getThingTypeUID());
normalizeConfiguration(thingType, thing.getUID(), ThingType::getConfigDescriptionURI, thing.getConfiguration());
for (Channel channel : thing.getChannels()) {
ChannelType channelType = channelTypeRegistry.getChannelType(channel.getChannelTypeUID());
normalizeConfiguration(channelType, channel.getUID(), ChannelType::getConfigDescriptionURI,
channel.getConfiguration());
}
}
private <T extends Identifiable<?>> void normalizeConfiguration(@Nullable T prototype, UID targetUID,
Function<T, @Nullable URI> configDescriptionURIFunction, Configuration configuration)
throws ConfigValidationException {
if (prototype == null) {
logger.debug("Prototype for '{}' is not known, assuming it is already normalized", targetUID);
return;
}
URI configDescriptionURI = configDescriptionURIFunction.apply(prototype);
if (configDescriptionURI == null) {
logger.debug("Config description URI for '{}' not found, assuming '{}' is normalized", prototype.getUID(),
targetUID);
return;
}
ConfigDescription configDescription = configDescriptionRegistry.getConfigDescription(configDescriptionURI);
if (configDescription == null) {
logger.warn(
"No config description for '{}' found when normalizing configuration for '{}'. This is probably a bug.",
configDescriptionURI, targetUID);
return;
}
Objects.requireNonNull(ConfigUtil.normalizeTypes(configuration.getProperties(), List.of(configDescription)))
.forEach(configuration::put);
}
private void doInitializeHandler(final ThingHandler thingHandler) { private void doInitializeHandler(final ThingHandler thingHandler) {
logger.debug("Calling initialize handler for thing '{}' at '{}'.", thingHandler.getThing().getUID(), logger.debug("Calling initialize handler for thing '{}' at '{}'.", thingHandler.getThing().getUID(),
thingHandler); thingHandler);
@ -1130,7 +1171,9 @@ public class ThingManagerImpl
} else { } else {
if (thingHandlerFactory != null) { if (thingHandlerFactory != null) {
final String identifier = getBundleIdentifier(thingHandlerFactory); final String identifier = getBundleIdentifier(thingHandlerFactory);
if (loadedXmlThingTypes.contains(identifier)) { if (loadedXmlThingTypes.contains(identifier)) {
normalizeThingConfiguration(thing);
registerHandler(thing, thingHandlerFactory); registerHandler(thing, thingHandlerFactory);
initializeHandler(thing); initializeHandler(thing);
} else { } else {