From ee59803df88b009c607b10d691f5c2804d1dbb28 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 14 Mar 2021 23:22:52 +0100 Subject: [PATCH] Remove org.jetbrains.annotations.NotNull (#10334) Only Eclipse JDT annotations should be used, see: https://www.openhab.org/docs/developer/guidelines.html#null-annotations Signed-off-by: Wouter Born --- .../binding/heos/internal/api/HeosFacade.java | 6 ++---- .../binding/miio/internal/cloud/CloudLoginDTO.java | 12 +++++------- .../binding/revogi/internal/api/StatusService.java | 2 -- .../binding/revogi/internal/api/SwitchService.java | 2 -- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosFacade.java b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosFacade.java index 221783e90..0aeecce3c 100644 --- a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosFacade.java +++ b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosFacade.java @@ -23,7 +23,6 @@ import java.util.List; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.jetbrains.annotations.NotNull; import org.openhab.binding.heos.internal.json.dto.HeosResponseObject; import org.openhab.binding.heos.internal.json.payload.BrowseResult; import org.openhab.binding.heos.internal.json.payload.Group; @@ -69,7 +68,6 @@ public class HeosFacade { return getBrowseResults(PLAYLISTS_SID); } - @NotNull private List getBrowseResults(String sourceIdentifier) throws IOException, ReadException { HeosResponseObject response = browseSource(sourceIdentifier); logger.debug("Response: {}", response); @@ -353,7 +351,7 @@ public class HeosFacade { /** * Get all the players known by HEOS - * + * * @return */ public HeosResponseObject getPlayers() throws IOException, ReadException { @@ -362,7 +360,7 @@ public class HeosFacade { /** * Get all the groups known by HEOS - * + * * @return */ public HeosResponseObject getGroups() throws IOException, ReadException { diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudLoginDTO.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudLoginDTO.java index 859e78eb9..712a533a5 100644 --- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudLoginDTO.java +++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudLoginDTO.java @@ -12,8 +12,6 @@ */ package org.openhab.binding.miio.internal.cloud; -import org.jetbrains.annotations.NotNull; - import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; @@ -64,23 +62,23 @@ public class CloudLoginDTO { @Expose private Object captchaUrl; - public @NotNull String getSsecurity() { + public String getSsecurity() { return ssecurity != null ? ssecurity : ""; } - public @NotNull String getUserId() { + public String getUserId() { return userId != null ? userId : ""; } - public @NotNull String getcUserId() { + public String getcUserId() { return cUserId != null ? cUserId : ""; } - public @NotNull String getPassToken() { + public String getPassToken() { return passToken != null ? passToken : ""; } - public @NotNull String getLocation() { + public String getLocation() { return location != null ? location : ""; } diff --git a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/StatusService.java b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/StatusService.java index ffb61d589..5ecc29d26 100644 --- a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/StatusService.java +++ b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/StatusService.java @@ -17,7 +17,6 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.jetbrains.annotations.NotNull; import org.openhab.binding.revogi.internal.udp.UdpResponseDTO; import org.openhab.binding.revogi.internal.udp.UdpSenderService; import org.slf4j.Logger; @@ -56,7 +55,6 @@ public class StatusService { return responses.thenApply(this::getStatus); } - @NotNull private StatusDTO getStatus(final List singleResponse) { return singleResponse.stream() .filter(response -> !response.getAnswer().isEmpty() && response.getAnswer().contains(VERSION_STRING)) diff --git a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchService.java b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchService.java index 042bfeccb..2f7ac6817 100644 --- a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchService.java +++ b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchService.java @@ -17,7 +17,6 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.jetbrains.annotations.NotNull; import org.openhab.binding.revogi.internal.udp.UdpResponseDTO; import org.openhab.binding.revogi.internal.udp.UdpSenderService; import org.slf4j.Logger; @@ -66,7 +65,6 @@ public class SwitchService { return responses.thenApply(this::getSwitchResponse); } - @NotNull private SwitchResponseDTO getSwitchResponse(final List singleResponse) { return singleResponse.stream().filter(response -> !response.getAnswer().isEmpty()) .map(response -> deserializeString(response.getAnswer()))