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

HABot: fix nullness (#85) 

After adding the nullness annotations to the automation the type
argument for the base module handler must be a non nullable one.
To apply the non-null annotation to the given type argument we mark the
whole class as non null by default.

Related to: https://github.com/openhab/openhab-core/pull/910

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
pull/90/head
Markus Rathgeb 2019-07-10 11:19:16 +02:00 committed by Kai Kreuzer
parent 914f213520
commit aaab65d8bf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/WebPushNotificationActionHandler.java
View File

@ -17,7 +17,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.automation.Action;
import org.openhab.core.automation.handler.ActionHandler;
@ -33,12 +33,12 @@ import com.google.gson.Gson;
*
* @author Yannick Schaus - Initial contribution
*/
@NonNullByDefault
public class WebPushNotificationActionHandler extends BaseModuleHandler<Action> implements ActionHandler {
/**
* The ID of this module type
*/
@NonNull
public static final String TYPE_ID = "habot.WebPushNotificationAction";
protected static final String PARAM_TITLE = "title";
@ -53,7 +53,7 @@ public class WebPushNotificationActionHandler extends BaseModuleHandler<Action>
/**
* Constructs a WebPushNotificationActionHandler instance
*
* @param module the {@link Action} module instance
* @param module the {@link Action} module instance
* @param notificationService the notification service to use to send the web push notifications
*/
public WebPushNotificationActionHandler(Action module, NotificationService notificationService) {
@ -62,8 +62,7 @@ public class WebPushNotificationActionHandler extends BaseModuleHandler<Action>
}
@Override
public @Nullable Map<@NonNull String, @NonNull Object> execute(
@NonNull Map<@NonNull String, @NonNull Object> context) {
public @Nullable Map<String, Object> execute(Map<String, Object> context) {
String title = (String) module.getConfiguration().get(PARAM_TITLE);
String body = (String) module.getConfiguration().get(PARAM_BODY);
String cardUID = (String) module.getConfiguration().get(PARAM_CARD_UID);