public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[infrastructure] move infered nullness warnings to error and update EEA (#8949)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K
2020-11-12 21:07:11 +01:00
committed by GitHub
parent 0856a0b3f2
commit ba4c96d99d
155 changed files with 644 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/rest/Scenes.java
View File

@@ -383,7 +383,7 @@ public class Scenes implements RegistryChangeListener<Rule> {
return NetworkUtils.singleError(cs.gson, uri, HueResponse.UNAUTHORIZED, "Not Authorized");
}
final HueStateChange changeRequest = cs.gson.fromJson(body, HueStateChange.class);
final HueStateChange changeRequest = Objects.requireNonNull(cs.gson.fromJson(body, HueStateChange.class));
Rule rule = ruleRegistry.remove(id);
if (rule == null) {

9
bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/rest/Schedules.java
View File

@@ -12,11 +12,7 @@
*/
package org.openhab.io.hueemulation.internal.rest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;
import javax.ws.rs.Consumes;
@@ -285,7 +281,8 @@ public class Schedules implements RegistryChangeListener<Rule> {
return NetworkUtils.singleError(cs.gson, uri, HueResponse.UNAUTHORIZED, "Not Authorized");
}
final HueChangeScheduleEntry changeRequest = cs.gson.fromJson(body, HueChangeScheduleEntry.class);
final HueChangeScheduleEntry changeRequest = Objects
.requireNonNull(cs.gson.fromJson(body, HueChangeScheduleEntry.class));
Rule rule = ruleRegistry.remove(id);
if (rule == null) {

20
bundles/org.openhab.io.hueemulation/src/test/java/org/openhab/io/hueemulation/internal/rest/mocks/DummyItemRegistry.java
View File

@@ -66,14 +66,16 @@ public class DummyItemRegistry implements ItemRegistry {
for (RegistryChangeListener<Item> l : listeners) {
l.added(element);
}
return put;
return element;
}
@Override
public @Nullable Item update(Item element) {
Item put = items.put(element.getUID(), element);
for (RegistryChangeListener<Item> l : listeners) {
l.updated(put, element);
if (put != null) {
for (RegistryChangeListener<Item> l : listeners) {
l.updated(put, element);
}
}
return put;
}
@@ -81,8 +83,10 @@ public class DummyItemRegistry implements ItemRegistry {
@Override
public @Nullable Item remove(String key) {
Item put = items.remove(key);
for (RegistryChangeListener<Item> l : listeners) {
l.removed(put);
if (put != null) {
for (RegistryChangeListener<Item> l : listeners) {
l.removed(put);
}
}
return put;
}
@@ -139,8 +143,10 @@ public class DummyItemRegistry implements ItemRegistry {
@Override
public @Nullable Item remove(String itemName, boolean recursive) {
Item put = items.remove(itemName);
for (RegistryChangeListener<Item> l : listeners) {
l.removed(put);
if (put != null) {
for (RegistryChangeListener<Item> l : listeners) {
l.removed(put);
}
}
return put;
}

14
bundles/org.openhab.io.hueemulation/src/test/java/org/openhab/io/hueemulation/internal/rest/mocks/DummyMetadataRegistry.java
View File

@@ -65,14 +65,16 @@ public class DummyMetadataRegistry implements MetadataRegistry {
for (RegistryChangeListener<Metadata> l : listeners) {
l.added(element);
}
return put;
return element;
}
@Override
public @Nullable Metadata update(Metadata element) {
Metadata put = items.put(element.getUID(), element);
for (RegistryChangeListener<Metadata> l : listeners) {
l.updated(put, element);
if (put != null) {
for (RegistryChangeListener<Metadata> l : listeners) {
l.updated(put, element);
}
}
return put;
}
@@ -80,8 +82,10 @@ public class DummyMetadataRegistry implements MetadataRegistry {
@Override
public @Nullable Metadata remove(MetadataKey key) {
Metadata put = items.remove(key);
for (RegistryChangeListener<Metadata> l : listeners) {
l.removed(put);
if (put != null) {
for (RegistryChangeListener<Metadata> l : listeners) {
l.removed(put);
}
}
return put;
}

14
bundles/org.openhab.io.hueemulation/src/test/java/org/openhab/io/hueemulation/internal/rest/mocks/DummyRuleRegistry.java
View File

@@ -65,14 +65,16 @@ public class DummyRuleRegistry implements RuleRegistry {
for (RegistryChangeListener<Rule> l : listeners) {
l.added(element);
}
return put;
return element;
}
@Override
public @Nullable Rule update(Rule element) {
Rule put = items.put(element.getUID(), element);
for (RegistryChangeListener<Rule> l : listeners) {
l.updated(put, element);
if (put != null) {
for (RegistryChangeListener<Rule> l : listeners) {
l.updated(put, element);
}
}
return put;
}
@@ -80,8 +82,10 @@ public class DummyRuleRegistry implements RuleRegistry {
@Override
public @Nullable Rule remove(String key) {
Rule put = items.remove(key);
for (RegistryChangeListener<Rule> l : listeners) {
l.removed(put);
if (put != null) {
for (RegistryChangeListener<Rule> l : listeners) {
l.removed(put);
}
}
return put;
}