Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[avmfritz] Avoid a hidden NPE when getIdentifier() of an uninitialized ThingHandler is called #9040

Merged
merged 3 commits into from
Nov 16, 2020
Merged

[avmfritz] Avoid a hidden NPE when getIdentifier() of an uninitialized ThingHandler is called #9040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d30ca8
Avoid a hidden NPE when getIdentifier() of an uninitialized ThingHand…
cweitkamp Nov 15, 2020
e311570
Fixed Powerline546EHandler
cweitkamp Nov 15, 2020
d6bdcfd
Removed comment
cweitkamp Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...rc/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzBaseBridgeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -126,7 +125,7 @@ public void initialize() {
AVMFritzBoxConfiguration config = getConfigAs(AVMFritzBoxConfiguration.class);

String localIpAddress = config.ipAddress;
if (localIpAddress == null || localIpAddress.trim().isEmpty()) {
if (localIpAddress == null || localIpAddress.isBlank()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
"The 'ipAddress' parameter must be configured.");
configValid = false;
Expand Down Expand Up @@ -271,10 +270,8 @@ public void onDeviceListAdded(List<AVMFritzBaseModel> deviceList) {
getThing().getThings().forEach(childThing -> {
final AVMFritzBaseThingHandler childHandler = (AVMFritzBaseThingHandler) childThing.getHandler();
if (childHandler != null) {
final Optional<AVMFritzBaseModel> optionalDevice = Optional
.ofNullable(deviceIdentifierMap.get(childHandler.getIdentifier()));
if (optionalDevice.isPresent()) {
final AVMFritzBaseModel device = optionalDevice.get();
final AVMFritzBaseModel device = deviceIdentifierMap.get(childHandler.getIdentifier());
if (device != null) {
deviceList.remove(device);
listeners.forEach(listener -> listener.onDeviceUpdated(childThing.getUID(), device));
} else {
Expand Down
12 changes: 6 additions & 6 deletions ...src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzBaseThingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public abstract class AVMFritzBaseThingHandler extends BaseThingHandler implemen
* keeps track of the current state for handling of increase/decrease
*/
private @Nullable AVMFritzBaseModel state;
private @NonNullByDefault({}) AVMFritzDeviceConfiguration config;
private @Nullable String identifier;

/**
* Constructor
Expand All @@ -95,13 +95,13 @@ public AVMFritzBaseThingHandler(Thing thing) {

@Override
public void initialize() {
config = getConfigAs(AVMFritzDeviceConfiguration.class);

String newIdentifier = config.ain;
if (newIdentifier == null || newIdentifier.trim().isEmpty()) {
final AVMFritzDeviceConfiguration config = getConfigAs(AVMFritzDeviceConfiguration.class);
final String newIdentifier = config.ain;
if (newIdentifier == null || newIdentifier.isBlank()) {
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR,
"The 'ain' parameter must be configured.");
} else {
this.identifier = newIdentifier;
updateStatus(ThingStatus.UNKNOWN);
}
}
Expand Down Expand Up @@ -472,6 +472,6 @@ private void handleRefreshCommand() {
* @return the AIN
*/
public @Nullable String getIdentifier() {
return config.ain;
return identifier;
}
}
53 changes: 17 additions & 36 deletions ...itz/src/main/java/org/openhab/binding/avmfritz/internal/handler/Powerline546EHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Predicate;

import org.eclipse.jdt.annotation.NonNullByDefault;
Expand All @@ -32,7 +31,6 @@
import org.openhab.binding.avmfritz.internal.dto.SwitchModel;
import org.openhab.binding.avmfritz.internal.hardware.FritzAhaStatusListener;
import org.openhab.binding.avmfritz.internal.hardware.FritzAhaWebInterface;
import org.openhab.core.config.core.Configuration;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.OpenClosedType;
import org.openhab.core.library.types.QuantityType;
Expand Down Expand Up @@ -72,7 +70,7 @@ public class Powerline546EHandler extends AVMFritzBaseBridgeHandler implements F
* keeps track of the current state for handling of increase/decrease
*/
private @Nullable AVMFritzBaseModel state;
private @Nullable AVMFritzDeviceConfiguration config;
private @Nullable String identifier;

/**
* Constructor
Expand All @@ -86,32 +84,27 @@ public Powerline546EHandler(Bridge bridge, HttpClient httpClient,

@Override
public void initialize() {
config = getConfigAs(AVMFritzDeviceConfiguration.class);

registerStatusListener(this);
final AVMFritzDeviceConfiguration config = getConfigAs(AVMFritzDeviceConfiguration.class);
final String newIdentifier = config.ain;
if (newIdentifier != null && !newIdentifier.isBlank()) {
this.identifier = newIdentifier;
}

super.initialize();
}

@Override
public void dispose() {
unregisterStatusListener(this);

super.dispose();
}

@SuppressWarnings({ "null", "unused" })
@Override
public void onDeviceListAdded(List<AVMFritzBaseModel> devicelist) {
final String identifier = getIdentifier();
final Predicate<AVMFritzBaseModel> predicate = identifier == null ? it -> thing.getUID().equals(getThingUID(it))
: it -> identifier.equals(it.getIdentifier());
final Optional<AVMFritzBaseModel> optionalDevice = devicelist.stream().filter(predicate).findFirst();
if (optionalDevice.isPresent()) {
final AVMFritzBaseModel device = optionalDevice.get();
final String ain = getIdentifier();
final Predicate<AVMFritzBaseModel> predicate = ain == null ? it -> thing.getUID().equals(getThingUID(it))
: it -> ain.equals(it.getIdentifier());
final AVMFritzBaseModel device = devicelist.stream().filter(predicate).findFirst().orElse(null);
if (device != null) {
devicelist.remove(device);
listeners.stream().forEach(listener -> listener.onDeviceUpdated(thing.getUID(), device));
onDeviceUpdated(thing.getUID(), device);
} else {
listeners.stream().forEach(listener -> listener.onDeviceGone(thing.getUID()));
onDeviceGone(thing.getUID());
}
super.onDeviceListAdded(devicelist);
}
Expand All @@ -125,8 +118,8 @@ public void onDeviceAdded(AVMFritzBaseModel device) {
public void onDeviceUpdated(ThingUID thingUID, AVMFritzBaseModel device) {
if (thing.getUID().equals(thingUID)) {
// save AIN to config for FRITZ!Powerline 546E stand-alone
if (config == null) {
updateConfiguration(device);
if (this.identifier == null) {
this.identifier = device.getIdentifier();
}

logger.debug("Update self '{}' with device model: {}", thingUID, device);
Expand Down Expand Up @@ -185,17 +178,6 @@ private void updateProperties(AVMFritzBaseModel device) {
updateProperties(editProperties);
}

/**
* Updates thing configuration.
*
* @param device the {@link AVMFritzBaseModel}
*/
private void updateConfiguration(AVMFritzBaseModel device) {
Configuration editConfig = editConfiguration();
editConfig.put(CONFIG_AIN, device.getIdentifier());
updateConfiguration(editConfig);
}

/**
* Updates thing channels and creates dynamic channels if missing.
*
Expand Down Expand Up @@ -311,7 +293,6 @@ public void handleCommand(ChannelUID channelUID, Command command) {
* @return the AIN
*/
public @Nullable String getIdentifier() {
AVMFritzDeviceConfiguration localConfig = config;
return localConfig != null ? localConfig.ain : null;
return identifier;
}
}