OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tweak ScriptedRuleProvider slightly (#3170) 

* tweak ScriptedRuleProvider slightly

just extend AbstractProvider so that it doesn't need to re-implement
managing listeners

Signed-off-by: Cody Cutrer <cody@cutrer.us>

* have ScriptedRuleProvider implement ManagedProvider

there's nothing that says ManagedProvider has to be backed by storage,
just that they should be able to add and remove elements

Since that's exactly what ScriptedRuleProvider does, might as well
have it conform to the interface.

Signed-off-by: Cody Cutrer <cody@cutrer.us>
pull/3177/head
Cody Cutrer 2022-11-24 10:55:52 -07:00 committed by GitHub
parent f6e36c1852
commit f0875a46f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/RuleSupportRuleRegistryDelegate.java
View File

@ -70,7 +70,7 @@ public class RuleSupportRuleRegistryDelegate implements RuleRegistry {
@Override
public Rule add(Rule element) {
ruleProvider.addRule(element);
ruleProvider.add(element);
rules.add(element.getUID());
return element;
@ -93,7 +93,7 @@ public class RuleSupportRuleRegistryDelegate implements RuleRegistry {
@Override
public @Nullable Rule remove(String key) {
if (rules.remove(key)) {
ruleProvider.removeRule(key);
return ruleProvider.remove(key);
}
return ruleRegistry.remove(key);
@ -109,11 +109,7 @@ public class RuleSupportRuleRegistryDelegate implements RuleRegistry {
*/
public void removeAllAddedByScript() {
for (String rule : rules) {
try {
ruleProvider.removeRule(rule);
} catch (Exception ex) {
// ignore
}
ruleProvider.remove(rule);
}
rules.clear();
}

63
bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/shared/ScriptedRuleProvider.java
View File

@ -12,64 +12,77 @@
*/
package org.openhab.core.automation.module.script.rulesupport.shared;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.automation.Rule;
import org.openhab.core.automation.RuleProvider;
import org.openhab.core.common.registry.ProviderChangeListener;
import org.openhab.core.common.registry.AbstractProvider;
import org.openhab.core.common.registry.ManagedProvider;
import org.osgi.service.component.annotations.Component;
/**
* This RuleProvider keeps Rules at added by scripts during the runtime. This ensures that Rules are not kept on reboot,
* This RuleProvider keeps Rules added by scripts during runtime. This ensures that Rules are not kept on reboot,
* but have to be added by the scripts again.
*
* @author Simon Merschjohann - Initial contribution
*/
@NonNullByDefault
@Component(immediate = true, service = { ScriptedRuleProvider.class, RuleProvider.class })
public class ScriptedRuleProvider implements RuleProvider {
private final Collection<ProviderChangeListener<Rule>> listeners = new ArrayList<>();
public class ScriptedRuleProvider extends AbstractProvider<Rule>
implements RuleProvider, ManagedProvider<Rule, String> {
private final Map<String, Rule> rules = new HashMap<>();
@Override
public void addProviderChangeListener(ProviderChangeListener<Rule> listener) {
listeners.add(listener);
}
@Override
public Collection<Rule> getAll() {
return rules.values();
}
@Override
public void removeProviderChangeListener(ProviderChangeListener<Rule> listener) {
listeners.remove(listener);
public @Nullable Rule get(String ruleUID) {
return rules.get(ruleUID);
}
public void addRule(Rule rule) {
@Override
public void add(Rule rule) {
rules.put(rule.getUID(), rule);
for (ProviderChangeListener<Rule> providerChangeListener : listeners) {
providerChangeListener.added(this, rule);
}
notifyListenersAboutAddedElement(rule);
}
public void removeRule(String ruleUID) {
Rule rule = rules.get(ruleUID);
if (rule != null) {
removeRule(rule);
@Deprecated
public void addRule(Rule rule) {
add(rule);
}
@Override
public @Nullable Rule update(Rule rule) {
Rule oldRule = rules.get(rule.getUID());
if (oldRule != null) {
rules.put(rule.getUID(), rule);
notifyListenersAboutUpdatedElement(oldRule, rule);
}
return oldRule;
}
@Override
public @Nullable Rule remove(String ruleUID) {
Rule rule = rules.remove(ruleUID);
if (rule != null) {
notifyListenersAboutRemovedElement(rule);
}
return rule;
}
@Deprecated
public void removeRule(String ruleUID) {
remove(ruleUID);
}
public void removeRule(Rule rule) {
rules.remove(rule.getUID());
for (ProviderChangeListener<Rule> providerChangeListener : listeners) {
providerChangeListener.removed(this, rule);
}
remove(rule.getUID());
}
}