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

[infrastructure] add external null-annotations (#1775) 

Add EEAs and fix null analysis errors.

Related to:

* #888
* openhab/openhab-addons#8848

Signed-off-by: Wouter Born <github@maindrain.net>
pull/1780/head
Wouter Born 2020-11-03 21:33:48 +01:00 committed by GitHub
parent a598fa94f4
commit 0281c10036
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
160 changed files with 645 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.addon.sample/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.audio/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

2
bundles/org.openhab.core.auth.jaas/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.auth.oauth2client/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.automation.module.media/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.automation.module.script.rulesupport/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

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

@ -186,9 +186,13 @@ public class RuleSupportScriptExtension implements ScriptExtensionProvider {
Map<String, Object> scopeValues = new HashMap<>();
Collection<String> values = PRESETS.get(preset);
for (String value : values) {
scopeValues.put(value, STATIC_TYPES.get(value));
if (values != null) {
for (String value : values) {
Object staticType = STATIC_TYPES.get(value);
if (staticType != null) {
scopeValues.put(value, staticType);
}
}
}
if (RULE_SUPPORT.equals(preset)) {

7
bundles/org.openhab.core.automation.module.script.rulesupport/src/main/java/org/openhab/core/automation/module/script/rulesupport/internal/ScriptedCustomModuleTypeProvider.java
View File

@ -81,9 +81,10 @@ public class ScriptedCustomModuleTypeProvider implements ModuleTypeProvider {
public void removeModuleType(String moduleTypeUID) {
ModuleType element = modulesTypes.remove(moduleTypeUID);
for (ProviderChangeListener<ModuleType> listener : listeners) {
listener.removed(this, element);
if (element != null) {
for (ProviderChangeListener<ModuleType> listener : listeners) {
listener.removed(this, element);
}
}
}

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

@ -60,7 +60,10 @@ public class ScriptedRuleProvider implements RuleProvider {
}
public void removeRule(String ruleUID) {
removeRule(rules.get(ruleUID));
Rule rule = rules.get(ruleUID);
if (rule != null) {
removeRule(rule);
}
}
public void removeRule(Rule rule) {

10
bundles/org.openhab.core.automation.module.script/.classpath
View File

@ -8,13 +8,21 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

6
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ItemRegistryDelegate.java
View File

@ -17,6 +17,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.items.Item;
import org.openhab.core.items.ItemNotFoundException;
import org.openhab.core.items.ItemRegistry;
@ -64,7 +65,10 @@ public class ItemRegistryDelegate implements Map<String, State> {
}
@Override
public State get(Object key) {
public State get(@Nullable Object key) {
if (key == null) {
return null;
}
final Item item = itemRegistry.get((String) key);
if (item == null) {
return null;

2
bundles/org.openhab.core.automation.rest/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.automation/.classpath
View File

@ -14,11 +14,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

4
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineModuleTypeProvider.java
View File

@ -253,7 +253,7 @@ public class CommandlineModuleTypeProvider extends AbstractCommandProvider<Modul
}
}
protected void notifyListeners(ModuleType oldElement, ModuleType newElement) {
protected void notifyListeners(@Nullable ModuleType oldElement, ModuleType newElement) {
synchronized (listeners) {
for (ProviderChangeListener<ModuleType> listener : listeners) {
if (oldElement != null) {
@ -264,7 +264,7 @@ public class CommandlineModuleTypeProvider extends AbstractCommandProvider<Modul
}
}
protected void notifyListeners(ModuleType removedObject) {
protected void notifyListeners(@Nullable ModuleType removedObject) {
if (removedObject != null) {
synchronized (listeners) {
for (ProviderChangeListener<ModuleType> listener : listeners) {

4
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/CommandlineTemplateProvider.java
View File

@ -244,7 +244,7 @@ public class CommandlineTemplateProvider extends AbstractCommandProvider<RuleTem
}
}
protected void notifyListeners(RuleTemplate oldElement, RuleTemplate newElement) {
protected void notifyListeners(@Nullable RuleTemplate oldElement, RuleTemplate newElement) {
synchronized (listeners) {
for (ProviderChangeListener<RuleTemplate> listener : listeners) {
if (oldElement != null) {
@ -255,7 +255,7 @@ public class CommandlineTemplateProvider extends AbstractCommandProvider<RuleTem
}
}
protected void notifyListeners(RuleTemplate removedObject) {
protected void notifyListeners(@Nullable RuleTemplate removedObject) {
if (removedObject != null) {
synchronized (listeners) {
for (ProviderChangeListener<RuleTemplate> listener : listeners) {

14
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/commands/Printer.java
View File

@ -107,12 +107,14 @@ public class Printer {
for (int i = 1; i <= ruleUIDs.size(); i++) {
String id = String.valueOf(i);
String uid = ruleUIDs.get(id);
columnValues.set(0, id);
columnValues.set(1, uid);
Rule rule = autoCommands.getRule(uid);
columnValues.set(2, rule.getName());
columnValues.set(3, autoCommands.getRuleStatus(uid).toString());
rulesRows.add(Utils.getRow(columnWidths, columnValues));
if (uid != null) {
columnValues.set(0, id);
columnValues.set(1, uid);
Rule rule = autoCommands.getRule(uid);
columnValues.set(2, rule.getName());
columnValues.set(3, autoCommands.getRuleStatus(uid).toString());
rulesRows.add(Utils.getRow(columnWidths, columnValues));
}
}
return Utils.getTableContent(TABLE_WIDTH, columnWidths, rulesRows, titleRow);
}

33
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/AbstractResourceBundleProvider.java
View File

@ -265,11 +265,11 @@ public abstract class AbstractResourceBundleProvider<@NonNull E> {
}
@SuppressWarnings("unchecked")
protected void removeUninstalledObjects(@Nullable List<String> previousPortfolio, List<String> newPortfolio) {
if (previousPortfolio != null && !previousPortfolio.isEmpty()) {
for (String uid : previousPortfolio) {
if (!newPortfolio.contains(uid)) {
E removedObject = providedObjectsHolder.remove(uid);
protected void removeUninstalledObjects(List<String> previousPortfolio, List<String> newPortfolio) {
for (String uid : previousPortfolio) {
if (!newPortfolio.contains(uid)) {
final @Nullable E removedObject = providedObjectsHolder.remove(uid);
if (removedObject != null) {
List<ProviderChangeListener<E>> snapshot = null;
synchronized (listeners) {
snapshot = new LinkedList<>(listeners);
@ -287,11 +287,12 @@ public abstract class AbstractResourceBundleProvider<@NonNull E> {
if (portfolio == null) {
for (Vendor v : providerPortfolio.keySet()) {
if (v.getVendorSymbolicName().equals(vendor.getVendorSymbolicName())) {
return providerPortfolio.remove(v);
List<String> vendorPortfolio = providerPortfolio.remove(v);
return vendorPortfolio == null ? List.of() : vendorPortfolio;
}
}
}
return portfolio;
return portfolio == null ? List.of() : portfolio;
}
protected void putNewPortfolio(Vendor vendor, List<String> portfolio) {
@ -330,13 +331,15 @@ public abstract class AbstractResourceBundleProvider<@NonNull E> {
List<String> portfolio = providerPortfolio.remove(vendor);
if (portfolio != null && !portfolio.isEmpty()) {
for (String uid : portfolio) {
E removedObject = providedObjectsHolder.remove(uid);
List<ProviderChangeListener<E>> snapshot = null;
synchronized (listeners) {
snapshot = new LinkedList<>(listeners);
}
for (ProviderChangeListener<E> listener : snapshot) {
listener.removed((Provider<E>) this, removedObject);
final @Nullable E removedObject = providedObjectsHolder.remove(uid);
if (removedObject != null) {
List<ProviderChangeListener<E>> snapshot = null;
synchronized (listeners) {
snapshot = new LinkedList<>(listeners);
}
for (ProviderChangeListener<E> listener : snapshot) {
listener.removed((Provider<E>) this, removedObject);
}
}
}
}
@ -435,7 +438,7 @@ public abstract class AbstractResourceBundleProvider<@NonNull E> {
}
for (E parsedObject : parsedObjects) {
String uid = getUID(parsedObject);
E oldElement = providedObjectsHolder.get(uid);
final @Nullable E oldElement = providedObjectsHolder.get(uid);
if (oldElement != null && !previousPortfolio.contains(uid)) {
logger.warn("{} with UID '{}' already exists! Failed to add a second with the same UID!",
parsedObject.getClass().getName(), uid);

7
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/RuleResourceBundleImporter.java
View File

@ -101,7 +101,7 @@ public class RuleResourceBundleImporter extends AbstractResourceBundleProvider<R
if (urlEnum != null) {
while (urlEnum.hasMoreElements()) {
URL url = urlEnum.nextElement();
if (getPreviousPortfolio(vendor) != null
if (!getPreviousPortfolio(vendor).isEmpty()
&& (waitingProviders.get(bundle) == null || !waitingProviders.get(bundle).contains(url))) {
return;
}
@ -147,11 +147,12 @@ public class RuleResourceBundleImporter extends AbstractResourceBundleProvider<R
if (portfolio == null) {
for (Vendor v : providerPortfolio.keySet()) {
if (v.getVendorSymbolicName().equals(vendor.getVendorSymbolicName())) {
return providerPortfolio.get(v);
List<String> vendorPortfolio = providerPortfolio.get(v);
return vendorPortfolio == null ? List.of() : vendorPortfolio;
}
}
}
return portfolio;
return portfolio == null ? List.of() : portfolio;
}
@Override

9
bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/provider/file/AbstractFileProvider.java
View File

@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.OpenHAB;
import org.openhab.core.automation.parser.Parser;
import org.openhab.core.automation.parser.ParsingException;
@ -268,14 +269,14 @@ public abstract class AbstractFileProvider<@NonNull E> implements Provider<E> {
for (E providedObject : providedObjects) {
String uid = getUID(providedObject);
uids.add(uid);
E oldProvidedObject = providedObjectsHolder.put(uid, providedObject);
final @Nullable E oldProvidedObject = providedObjectsHolder.put(uid, providedObject);
notifyListeners(oldProvidedObject, providedObject);
}
providerPortfolio.put(url, uids);
}
}
protected void removeElements(List<String> objectsForRemove) {
protected void removeElements(@Nullable List<String> objectsForRemove) {
if (objectsForRemove != null) {
for (String removedObject : objectsForRemove) {
notifyListeners(providedObjectsHolder.remove(removedObject));
@ -283,7 +284,7 @@ public abstract class AbstractFileProvider<@NonNull E> implements Provider<E> {
}
}
protected void notifyListeners(E oldElement, E newElement) {
protected void notifyListeners(@Nullable E oldElement, E newElement) {
synchronized (listeners) {
for (ProviderChangeListener<E> listener : listeners) {
if (oldElement != null) {
@ -295,7 +296,7 @@ public abstract class AbstractFileProvider<@NonNull E> implements Provider<E> {
}
}
protected void notifyListeners(E removedObject) {
protected void notifyListeners(@Nullable E removedObject) {
if (removedObject != null) {
synchronized (listeners) {
for (ProviderChangeListener<E> listener : listeners) {

2
bundles/org.openhab.core.binding.xml/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

4
bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoConverter.java
View File

@ -85,7 +85,11 @@ public class BindingInfoConverter extends GenericUnmarshaller<BindingInfoXmlResu
// read attributes
Map<String, String> attributes = this.attributeMapValidator.readValidatedAttributes(reader);
String id = attributes.get("id");
if (id == null) {
throw new ConversionException("Binding id attribute is null");
}
// set automatically extracted URI for a possible 'config-description' section
context.put("config-description.uri", "binding:" + id);

5
bundles/org.openhab.core.binding.xml/src/main/java/org/openhab/core/binding/xml/internal/BindingInfoReader.java
View File

@ -49,7 +49,10 @@ public class BindingInfoReader extends XmlDocumentReader<BindingInfoXmlResult> {
* The default constructor of this class.
*/
public BindingInfoReader() {
super.setClassLoader(BindingInfoReader.class.getClassLoader());
ClassLoader classLoader = BindingInfoReader.class.getClassLoader();
if (classLoader != null) {
super.setClassLoader(classLoader);
}
}
@Override

2
bundles/org.openhab.core.config.core/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

2
bundles/org.openhab.core.config.discovery.mdns/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.config.discovery.upnp/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.config.discovery.usbserial.linuxsysfs/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.config.discovery.usbserial/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.config.discovery/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

9
bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/internal/PersistentInbox.java
View File

@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@ -534,13 +535,15 @@ public final class PersistentInbox implements Inbox, DiscoveryListener, ThingReg
final List<ConfigDescriptionParameter> configDescParams = getConfigDescParams(discoveryResult);
final Set<String> paramNames = getConfigDescParamNames(configDescParams);
final Map<String, Object> resultProps = discoveryResult.getProperties();
for (String resultKey : resultProps.keySet()) {
for (Entry<String, Object> resultEntry : resultProps.entrySet()) {
String resultKey = resultEntry.getKey();
Object resultValue = resultEntry.getValue();
if (paramNames.contains(resultKey)) {
ConfigDescriptionParameter param = getConfigDescriptionParam(configDescParams, resultKey);
Object normalizedValue = ConfigUtil.normalizeType(resultProps.get(resultKey), param);
Object normalizedValue = ConfigUtil.normalizeType(resultValue, param);
configParams.put(resultKey, normalizedValue);
} else {
props.put(resultKey, String.valueOf(resultProps.get(resultKey)));
props.put(resultKey, String.valueOf(resultValue));
}
}
}

2
bundles/org.openhab.core.config.dispatch/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.config.serial/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.config.xml/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

8
bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/AbstractXmlBasedProvider.java
View File

@ -165,16 +165,14 @@ public abstract class AbstractXmlBasedProvider<@NonNull T_ID, @NonNull T_OBJECT
private T_OBJECT acquireLocalizedObject(Bundle bundle, T_OBJECT object, @Nullable Locale locale) {
final LocalizedKey localizedKey = getLocalizedKey(object, locale);
final T_OBJECT cacheEntry = localizedObjectCache.get(localizedKey);
final @Nullable T_OBJECT cacheEntry = localizedObjectCache.get(localizedKey);
if (cacheEntry != null) {
return cacheEntry;
}
@Nullable
final T_OBJECT localizedObject = localize(bundle, object, locale);
final @Nullable T_OBJECT localizedObject = localize(bundle, object, locale);
if (localizedObject != null) {
@NonNull
T_OBJECT nonNullLocalizedObject = (@NonNull T_OBJECT) localizedObject;
T_OBJECT nonNullLocalizedObject = localizedObject;
localizedObjectCache.put(localizedKey, nonNullLocalizedObject);
return localizedObject;
} else {

5
bundles/org.openhab.core.config.xml/src/main/java/org/openhab/core/config/xml/internal/ConfigDescriptionReader.java
View File

@ -50,7 +50,10 @@ public class ConfigDescriptionReader extends XmlDocumentReader<List<ConfigDescri
* The default constructor of this class.
*/
public ConfigDescriptionReader() {
super.setClassLoader(ConfigDescriptionReader.class.getClassLoader());
ClassLoader classLoader = ConfigDescriptionReader.class.getClassLoader();
if (classLoader != null) {
super.setClassLoader(classLoader);
}
}
@Override

2
bundles/org.openhab.core.ephemeris/.classpath
View File

@ -14,11 +14,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.id/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.bin2json/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.console.eclipse/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.console.karaf/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.console.rfc147/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.console/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.http.auth.basic/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

7
bundles/org.openhab.core.io.http.auth/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
@ -23,5 +25,10 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="pages">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

2
bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AbstractAuthPageServlet.java
View File

@ -117,7 +117,7 @@ public abstract class AbstractAuthPageServlet extends HttpServlet {
return user;
}
protected void processFailedLogin(HttpServletResponse resp, Map<String, String[]> params, String message)
protected void processFailedLogin(HttpServletResponse resp, Map<String, String[]> params, @Nullable String message)
throws IOException {
lastAuthenticationFailure = Instant.now();
authenticationFailureCount += 1;

2
bundles/org.openhab.core.io.http/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.jetty.certificate/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.io.monitor/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.net/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest.audio/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

7
bundles/org.openhab.core.io.rest.auth/.classpath
View File

@ -16,9 +16,16 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>

2
bundles/org.openhab.core.io.rest.core/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest.core/src/main/java/org/openhab/core/io/rest/core/internal/addons/AddonResource.java
View File

@ -214,7 +214,7 @@ public class AddonResource implements RESTResource {
return Response.ok(null, MediaType.TEXT_PLAIN).build();
}
private void postFailureEvent(String addonId, String msg) {
private void postFailureEvent(String addonId, @Nullable String msg) {
Event event = AddonEventFactory.createAddonFailureEvent(addonId, msg);
eventPublisher.post(event);
}

2
bundles/org.openhab.core.io.rest.log/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest.mdns/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest.sitemap/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest.sse/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest.swagger/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.io.rest.ui/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest.voice/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.rest/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

6
bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/SseBroadcaster.java
View File

@ -146,8 +146,10 @@ public class SseBroadcaster<@NonNull I> implements Closeable {
}
private void handleRemoval(final SseEventSink sink) {
final I info = sinks.remove(sink);
notifyAboutRemoval(sink, info);
final @Nullable I info = sinks.remove(sink);
if (info != null) {
notifyAboutRemoval(sink, info);
}
}
private void notifyAboutRemoval(final SseEventSink sink, I info) {

15
bundles/org.openhab.core.io.rest/src/main/java/org/openhab/core/io/rest/internal/resources/beans/SystemInfoBean.java
View File

@ -13,6 +13,7 @@
package org.openhab.core.io.rest.internal.resources.beans;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.OpenHAB;
/**
@ -28,13 +29,13 @@ public class SystemInfoBean {
public static class SystemInfo {
public final String configFolder = OpenHAB.getConfigFolder();
public final String userdataFolder = OpenHAB.getUserDataFolder();
public final String logFolder = System.getProperty("openhab.logdir");
public final String javaVersion = System.getProperty("java.version");
public final String javaVendor = System.getProperty("java.vendor");
public final String javaVendorVersion = System.getProperty("java.vendor.version");
public final String osName = System.getProperty("os.name");
public final String osVersion = System.getProperty("os.version");
public final String osArchitecture = System.getProperty("os.arch");
public final @Nullable String logFolder = System.getProperty("openhab.logdir");
public final @Nullable String javaVersion = System.getProperty("java.version");
public final @Nullable String javaVendor = System.getProperty("java.vendor");
public final @Nullable String javaVendorVersion = System.getProperty("java.vendor.version");
public final @Nullable String osName = System.getProperty("os.name");
public final @Nullable String osVersion = System.getProperty("os.version");
public final @Nullable String osArchitecture = System.getProperty("os.arch");
public final int availableProcessors = Runtime.getRuntime().availableProcessors();
public final long freeMemory = Runtime.getRuntime().freeMemory();
public final long totalMemory = Runtime.getRuntime().totalMemory();

2
bundles/org.openhab.core.io.transport.mdns/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.transport.mqtt/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

5
bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttException.java
View File

@ -13,6 +13,7 @@
package org.openhab.core.io.transport.mqtt;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
/**
* Thrown if an error occurs communicating with the server. The exception contains a reason code. The semantic of the
@ -51,7 +52,7 @@ public class MqttException extends Exception {
* which may be <code>null</code>.
*/
@Override
public Throwable getCause() {
public @Nullable Throwable getCause() {
return cause;
}
@ -59,7 +60,7 @@ public class MqttException extends Exception {
* Returns the detail message for this exception. May be null.
*/
@Override
public String getMessage() {
public @Nullable String getMessage() {
return cause.getMessage();
}

8
bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/MqttWillAndTestament.java
View File

@ -156,14 +156,12 @@ public class MqttWillAndTestament {
@Override
public String toString() {
byte[] localPayload = this.payload;
StringBuilder sb = new StringBuilder();
sb.append("[").append(getClass());
sb.append("] Send '");
if (payload != null) {
sb.append(new String(payload));
} else {
sb.append(payload);
}
sb.append(localPayload == null ? localPayload : new String(localPayload));
sb.append("' to topic '");
sb.append(topic);
sb.append("'");

18
bundles/org.openhab.core.io.transport.mqtt/src/test/java/org/openhab/core/io/transport/mqtt/MqttBrokerConnectionTests.java
View File

@ -46,6 +46,12 @@ import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
*/
@NonNullByDefault
public class MqttBrokerConnectionTests extends JavaTest {
private static final byte[] HELLO_BYTES = "hello".getBytes();
private static byte[] eqHelloBytes() {
return eq(HELLO_BYTES);
}
@Test
public void subscribeBeforeOnlineThenConnect()
throws ConfigurationException, MqttException, InterruptedException, ExecutionException, TimeoutException {
@ -60,11 +66,11 @@ public class MqttBrokerConnectionTests extends JavaTest {
assertTrue(connection.hasSubscribers());
assertThat(connection.connectionState(), is(MqttConnectionState.CONNECTED));
Mqtt3Publish publishMessage = Mqtt3Publish.builder().topic("homie/device123/$name").payload("hello".getBytes())
Mqtt3Publish publishMessage = Mqtt3Publish.builder().topic("homie/device123/$name").payload(HELLO_BYTES)
.build();
// Test if subscription is active
connection.getSubscribers().get("homie/device123/$name").messageArrived(publishMessage);
verify(subscriber).processMessage(eq("homie/device123/$name"), eq("hello".getBytes()));
verify(subscriber).processMessage(eq("homie/device123/$name"), eqHelloBytes());
}
@Test
@ -87,15 +93,15 @@ public class MqttBrokerConnectionTests extends JavaTest {
assertTrue(connection.hasSubscribers());
assertThat(connection.connectionState(), is(MqttConnectionState.CONNECTED));
Mqtt3Publish publishMessage = Mqtt3Publish.builder().topic("homie/device123/$name").payload("hello".getBytes())
Mqtt3Publish publishMessage = Mqtt3Publish.builder().topic("homie/device123/$name").payload(HELLO_BYTES)
.build();
connection.getSubscribers().get("homie/device123/+").messageArrived(publishMessage);
connection.getSubscribers().get("#").messageArrived(publishMessage);
connection.getSubscribers().get("homie/#").messageArrived(publishMessage);
verify(subscriber).processMessage(eq("homie/device123/$name"), eq("hello".getBytes()));
verify(subscriber2).processMessage(eq("homie/device123/$name"), eq("hello".getBytes()));
verify(subscriber3).processMessage(eq("homie/device123/$name"), eq("hello".getBytes()));
verify(subscriber).processMessage(eq("homie/device123/$name"), eqHelloBytes());
verify(subscriber2).processMessage(eq("homie/device123/$name"), eqHelloBytes());
verify(subscriber3).processMessage(eq("homie/device123/$name"), eqHelloBytes());
}
@Test

2
bundles/org.openhab.core.io.transport.serial.javacomm/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.transport.serial.rxtx.rfc2217/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.transport.serial.rxtx/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

4
bundles/org.openhab.core.io.transport.serial.rxtx/src/main/java/org/openhab/core/io/transport/serial/internal/SerialPortUtil.java
View File

@ -78,7 +78,9 @@ public class SerialPortUtil {
System.clearProperty(GNU_IO_RXTX_SERIAL_PORTS);
identifiers = CommPortIdentifier.getPortIdentifiers();
// Restore the existing serial ports property
System.setProperty(GNU_IO_RXTX_SERIAL_PORTS, value);
if (value != null) {
System.setProperty(GNU_IO_RXTX_SERIAL_PORTS, value);
}
} else {
identifiers = CommPortIdentifier.getPortIdentifiers();
}

2
bundles/org.openhab.core.io.transport.serial/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.io.transport.upnp/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">

2
bundles/org.openhab.core.karaf/.classpath
View File

@ -21,11 +21,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

9
bundles/org.openhab.core.karaf/src/main/java/org/openhab/core/karaf/internal/command/InstallServiceCommand.java
View File

@ -100,8 +100,13 @@ public class InstallServiceCommand implements Action {
String karafBase = System.getProperty("karaf.base");
String karafHome = System.getProperty("karaf.home");
// can we install to karaf.home?
if (!new File(karafHome).canWrite()) {
if (karafBase == null) {
System.out.println("System property karaf.base is not set. Install aborted.");
return null;
} else if (karafHome == null) {
System.out.println("System property karaf.home is not set. Install aborted.");
return null;
} else if (!new File(karafHome).canWrite()) {
System.out.println("Cannot write to " + karafHome + ". Install aborted.");
return null;
}

2
bundles/org.openhab.core.model.core/.classpath
View File

@ -14,11 +14,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.item.ide/.classpath
View File

@ -28,11 +28,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.item.runtime/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

9
bundles/org.openhab.core.model.item/.classpath
View File

@ -26,11 +26,20 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="notestsources">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

6
bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java
View File

@ -393,8 +393,8 @@ public class GenericItemProvider extends AbstractProvider<Item>
Map<String, Item> newItems = toItemMap(getItemsFromModel(modelName));
itemsMap.put(modelName, newItems.values());
for (Item newItem : newItems.values()) {
if (oldItems.containsKey(newItem.getName())) {
Item oldItem = oldItems.get(newItem.getName());
Item oldItem = oldItems.get(newItem.getName());
if (oldItem != null) {
if (hasItemChanged(oldItem, newItem)) {
notifyListenersAboutUpdatedElement(oldItem, newItem);
}
@ -473,7 +473,7 @@ public class GenericItemProvider extends AbstractProvider<Item>
return !(sameBaseItemClass && sameFunction);
}
private Map<String, Item> toItemMap(Collection<Item> items) {
private Map<String, Item> toItemMap(@Nullable Collection<Item> items) {
if (items == null || items.isEmpty()) {
return Collections.emptyMap();
}

2
bundles/org.openhab.core.model.lazygen/.classpath
View File

@ -14,11 +14,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.lsp/.classpath
View File

@ -21,11 +21,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

16
bundles/org.openhab.core.model.lsp/src/main/java/org/openhab/core/model/lsp/internal/MappingUriExtensions.java
View File

@ -57,14 +57,14 @@ public class MappingUriExtensions extends UriExtensions {
@Override
public URI toUri(String pathWithScheme) {
String decodedPathWithScheme = URLDecoder.decode(pathWithScheme, StandardCharsets.UTF_8);
if (clientLocation != null && decodedPathWithScheme.startsWith(clientLocation)) {
String localClientLocation = clientLocation;
if (localClientLocation != null && decodedPathWithScheme.startsWith(localClientLocation)) {
return map(decodedPathWithScheme);
}
clientLocation = guessClientPath(decodedPathWithScheme);
if (clientLocation != null) {
logger.debug("Identified client workspace as '{}'", clientLocation);
localClientLocation = clientLocation = guessClientPath(decodedPathWithScheme);
if (localClientLocation != null) {
logger.debug("Identified client workspace as '{}'", localClientLocation);
return map(decodedPathWithScheme);
}
@ -89,8 +89,10 @@ public class MappingUriExtensions extends UriExtensions {
}
private String mapToClientPath(String pathWithScheme) {
String clientPath = toPathAsInXtext212(
java.net.URI.create(pathWithScheme.replace(serverLocation, clientLocation)));
String clientLocation = this.clientLocation;
String uriString = clientLocation == null ? serverLocation
: pathWithScheme.replace(serverLocation, clientLocation);
String clientPath = toPathAsInXtext212(java.net.URI.create(uriString));
logger.trace("Mapping server path {} to client path {}", pathWithScheme, clientPath);
return clientPath;
}

2
bundles/org.openhab.core.model.persistence.ide/.classpath
View File

@ -28,11 +28,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.persistence.runtime/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

9
bundles/org.openhab.core.model.persistence/.classpath
View File

@ -26,11 +26,20 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="notestsources">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.rule.ide/.classpath
View File

@ -28,11 +28,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.rule.runtime/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

9
bundles/org.openhab.core.model.rule/.classpath
View File

@ -26,11 +26,20 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="notestsources">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.script.ide/.classpath
View File

@ -28,11 +28,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.script.runtime/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.script/.classpath
View File

@ -38,11 +38,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.sitemap.ide/.classpath
View File

@ -28,11 +28,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.sitemap.runtime/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

9
bundles/org.openhab.core.model.sitemap/.classpath
View File

@ -26,11 +26,20 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="notestsources">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

5
bundles/org.openhab.core.model.sitemap/src/org/openhab/core/model/sitemap/internal/SitemapProviderImpl.java
View File

@ -111,7 +111,10 @@ public class SitemapProviderImpl implements SitemapProvider, ModelRepositoryChan
sitemapModelCache.clear();
Iterable<String> sitemapNames = modelRepo.getAllModelNamesOfType(SITEMAP_MODEL_NAME);
for (String sitemapName : sitemapNames) {
sitemapModelCache.put(sitemapName, (Sitemap) modelRepo.getModel(sitemapName));
Sitemap sitemap = (Sitemap) modelRepo.getModel(sitemapName);
if (sitemap != null) {
sitemapModelCache.put(sitemapName, sitemap);
}
}
}

2
bundles/org.openhab.core.model.thing.ide/.classpath
View File

@ -28,11 +28,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.thing.runtime/.classpath
View File

@ -16,11 +16,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.model.thing/.classpath
View File

@ -33,11 +33,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>

2
bundles/org.openhab.core.persistence/.classpath
View File

@ -9,11 +9,13 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="annotationpath" value="target/dependency"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">

Some files were not shown because too many files have changed in this diff Show More