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

6
bundles/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/NukiHandlerFactory.java
View File

@@ -12,8 +12,6 @@
*/
package org.openhab.binding.nuki.internal;
import java.util.ArrayList;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jetty.client.HttpClient;
@@ -118,9 +116,7 @@ public class NukiHandlerFactory extends BaseThingHandlerFactory {
logger.warn("Cannot find port of the http service.");
return null;
}
ArrayList<String> parameters = new ArrayList<>();
parameters.add(ipAddress + ":" + port);
String callbackUrl = String.format(NukiBindingConstants.CALLBACK_URL, parameters.toArray());
String callbackUrl = String.format(NukiBindingConstants.CALLBACK_URL, ipAddress + ":" + port);
logger.trace("callbackUrl[{}]", callbackUrl);
return callbackUrl;
}

17
bundles/org.openhab.binding.nuki/src/main/java/org/openhab/binding/nuki/internal/dataexchange/NukiHttpClient.java
View File

@@ -17,7 +17,6 @@ import java.math.BigDecimal;
import java.net.SocketException;
import java.net.URLEncoder;
import java.time.Instant;
import java.util.ArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
@@ -64,16 +63,12 @@ public class NukiHttpClient {
String configIp = (String) configuration.get(NukiBindingConstants.CONFIG_IP);
BigDecimal configPort = (BigDecimal) configuration.get(NukiBindingConstants.CONFIG_PORT);
String configApiToken = (String) configuration.get(NukiBindingConstants.CONFIG_API_TOKEN);
ArrayList<String> parameters = new ArrayList<>();
parameters.add(configIp);
parameters.add(configPort.toString());
parameters.add(configApiToken);
if (additionalArguments != null) {
for (String argument : additionalArguments) {
parameters.add(argument);
}
}
String uri = String.format(uriTemplate, parameters.toArray());
String[] parameters = new String[additionalArguments.length + 3];
parameters[0] = configIp;
parameters[1] = configPort.toString();
parameters[2] = configApiToken;
System.arraycopy(additionalArguments, 0, parameters, 3, additionalArguments.length);
String uri = String.format(uriTemplate, parameters);
logger.trace("prepareUri(...):URI[{}]", uri);
return uri;
}