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

Remove Map null annotation workarounds (#8916)

Browse Source 
These workarounds to prevent false positives can be removed now the EEAs allow for proper null analysis.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-11-04 13:57:24 +01:00
committed by GitHub
parent 1dccf67909
commit b423f93b1f
124 changed files with 315 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/InfluxDBPersistenceService.java
View File

@@ -103,7 +103,7 @@ public class InfluxDBPersistenceService implements QueryablePersistenceService {
* Connect to database when service is activated
*/
@Activate
public void activate(final @Nullable Map<String, @Nullable Object> config) {
public void activate(final @Nullable Map<String, Object> config) {
logger.debug("InfluxDB persistence service is being activated");
if (loadConfiguration(config)) {
@@ -141,7 +141,7 @@ public class InfluxDBPersistenceService implements QueryablePersistenceService {
* Rerun deactivation/activation code each time configuration is changed
*/
@Modified
protected void modified(@Nullable Map<String, @Nullable Object> config) {
protected void modified(@Nullable Map<String, Object> config) {
if (config != null) {
logger.debug("Config has been modified will deactivate/activate with new config");
@@ -152,7 +152,7 @@ public class InfluxDBPersistenceService implements QueryablePersistenceService {
}
}
private boolean loadConfiguration(@Nullable Map<String, @Nullable Object> config) {
private boolean loadConfiguration(@Nullable Map<String, Object> config) {
boolean configurationIsValid;
if (config != null) {
configuration = new InfluxDBConfiguration(config);

18
bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBConfiguration.java
View File

@@ -16,7 +16,6 @@ import java.util.Collections;
import java.util.Map;
import java.util.StringJoiner;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.slf4j.Logger;
@@ -55,13 +54,13 @@ public class InfluxDBConfiguration {
private final boolean addTypeTag;
private final boolean addLabelTag;
public InfluxDBConfiguration(Map<String, @Nullable Object> config) {
url = (@NonNull String) config.getOrDefault(URL_PARAM, "http://127.0.0.1:8086");
user = (@NonNull String) config.getOrDefault(USER_PARAM, "openhab");
password = (@NonNull String) config.getOrDefault(PASSWORD_PARAM, "");
token = (@NonNull String) config.getOrDefault(TOKEN_PARAM, "");
databaseName = (@NonNull String) config.getOrDefault(DATABASE_PARAM, "openhab");
retentionPolicy = (@NonNull String) config.getOrDefault(RETENTION_POLICY_PARAM, "autogen");
public InfluxDBConfiguration(Map<String, Object> config) {
url = (String) config.getOrDefault(URL_PARAM, "http://127.0.0.1:8086");
user = (String) config.getOrDefault(USER_PARAM, "openhab");
password = (String) config.getOrDefault(PASSWORD_PARAM, "");
token = (String) config.getOrDefault(TOKEN_PARAM, "");
databaseName = (String) config.getOrDefault(DATABASE_PARAM, "openhab");
retentionPolicy = (String) config.getOrDefault(RETENTION_POLICY_PARAM, "autogen");
version = parseInfluxVersion(config.getOrDefault(VERSION_PARAM, InfluxDBVersion.V1.name()));
replaceUnderscore = getConfigBooleanValue(config, REPLACE_UNDERSCORE_PARAM, false);
@@ -70,8 +69,7 @@ public class InfluxDBConfiguration {
addTypeTag = getConfigBooleanValue(config, ADD_TYPE_TAG_PARAM, false);
}
private static boolean getConfigBooleanValue(Map<String, @Nullable Object> config, String key,
boolean defaultValue) {
private static boolean getConfigBooleanValue(Map<String, Object> config, String key, boolean defaultValue) {
Object object = config.get(key);
if (object instanceof Boolean) {
return (Boolean) object;

15
bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/ConfigurationTestHelper.java
View File

@@ -12,17 +12,12 @@
*/
package org.openhab.persistence.influxdb.internal;
import static org.openhab.persistence.influxdb.internal.InfluxDBConfiguration.DATABASE_PARAM;
import static org.openhab.persistence.influxdb.internal.InfluxDBConfiguration.RETENTION_POLICY_PARAM;
import static org.openhab.persistence.influxdb.internal.InfluxDBConfiguration.TOKEN_PARAM;
import static org.openhab.persistence.influxdb.internal.InfluxDBConfiguration.URL_PARAM;
import static org.openhab.persistence.influxdb.internal.InfluxDBConfiguration.VERSION_PARAM;
import static org.openhab.persistence.influxdb.internal.InfluxDBConfiguration.*;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
/**
* @author Joan Pujol Espinar - Initial contribution
@@ -30,8 +25,8 @@ import org.eclipse.jdt.annotation.Nullable;
@NonNullByDefault
public class ConfigurationTestHelper {
public static Map<String, @Nullable Object> createValidConfigurationParameters() {
Map<String, @Nullable Object> config = new HashMap<>();
public static Map<String, Object> createValidConfigurationParameters() {
Map<String, Object> config = new HashMap<>();
config.put(URL_PARAM, "http://localhost:8086");
config.put(VERSION_PARAM, InfluxDBVersion.V2.name());
config.put(TOKEN_PARAM, "sampletoken");
@@ -44,8 +39,8 @@ public class ConfigurationTestHelper {
return new InfluxDBConfiguration(createValidConfigurationParameters());
}
public static Map<String, @Nullable Object> createInvalidConfigurationParameters() {
Map<String, @Nullable Object> config = createValidConfigurationParameters();
public static Map<String, Object> createInvalidConfigurationParameters() {
Map<String, Object> config = createValidConfigurationParameters();
config.remove(TOKEN_PARAM);
return config;
}

5
bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBPersistenceServiceTest.java
View File

@@ -19,7 +19,6 @@ import java.util.Map;
import org.eclipse.jdt.annotation.DefaultLocation;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -40,8 +39,8 @@ public class InfluxDBPersistenceServiceTest {
private @Mock InfluxDBRepository influxDBRepository;
private Map<String, @Nullable Object> validConfig;
private Map<String, @Nullable Object> invalidConfig;
private Map<String, Object> validConfig;
private Map<String, Object> invalidConfig;
@BeforeEach
public void before() {