demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix duplicate serialNumbers (#9422)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K 2020-12-18 23:17:52 +01:00 committed by GitHub
parent 0b5f9efb26
commit a156f3ca15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java
View File

@ -26,20 +26,7 @@ import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Random;
import java.util.Scanner;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
@ -1052,15 +1039,13 @@ public class Connection {
} }
public List<Device> getDeviceList() throws IOException, URISyntaxException, InterruptedException { public List<Device> getDeviceList() throws IOException, URISyntaxException, InterruptedException {
String json = getDeviceListJson(); JsonDevices devices = Objects.requireNonNull(parseJson(getDeviceListJson(), JsonDevices.class));
JsonDevices devices = parseJson(json, JsonDevices.class); logger.trace("Devices {}", devices.devices);
if (devices != null) {
Device[] result = devices.devices; // @Nullable because of a limitation of the null-checker, we filter null-serialNumbers before
if (result != null) { Set<@Nullable String> serialNumbers = ConcurrentHashMap.newKeySet();
return new ArrayList<>(Arrays.asList(result)); return devices.devices.stream().filter(d -> d.serialNumber != null && serialNumbers.add(d.serialNumber))
} .collect(Collectors.toList());
}
return Collections.emptyList();
} }
public String getDeviceListJson() throws IOException, URISyntaxException, InterruptedException { public String getDeviceListJson() throws IOException, URISyntaxException, InterruptedException {

4
bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/AccountHandler.java
View File

@ -93,7 +93,7 @@ import com.google.gson.JsonSyntaxException;
@NonNullByDefault @NonNullByDefault
public class AccountHandler extends BaseBridgeHandler implements IWebSocketCommandHandler, IAmazonThingHandler { public class AccountHandler extends BaseBridgeHandler implements IWebSocketCommandHandler, IAmazonThingHandler {
private final Logger logger = LoggerFactory.getLogger(AccountHandler.class); private final Logger logger = LoggerFactory.getLogger(AccountHandler.class);
private Storage<String> stateStorage; private final Storage<String> stateStorage;
private @Nullable Connection connection; private @Nullable Connection connection;
private @Nullable WebSocketConnection webSocketConnection; private @Nullable WebSocketConnection webSocketConnection;
@ -651,7 +651,7 @@ public class AccountHandler extends BaseBridgeHandler implements IWebSocketComma
if (devices != null) { if (devices != null) {
return devices; return devices;
} }
return Collections.emptyList(); return List.of();
} }
public void setEnabledFlashBriefingsJson(String flashBriefingJson) { public void setEnabledFlashBriefingsJson(String flashBriefingJson) {

14
bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/jsons/JsonDevices.java
View File

@ -12,6 +12,9 @@
*/ */
package org.openhab.binding.amazonechocontrol.internal.jsons; package org.openhab.binding.amazonechocontrol.internal.jsons;
import java.util.Arrays;
import java.util.List;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
@ -33,7 +36,16 @@ public class JsonDevices {
public @Nullable String softwareVersion; public @Nullable String softwareVersion;
public boolean online; public boolean online;
public @Nullable String @Nullable [] capabilities; public @Nullable String @Nullable [] capabilities;
@Override
public String toString() {
return "Device{" + "accountName='" + accountName + '\'' + ", serialNumber='" + serialNumber + '\''
+ ", deviceOwnerCustomerId='" + deviceOwnerCustomerId + '\'' + ", deviceAccountId='"
+ deviceAccountId + '\'' + ", deviceFamily='" + deviceFamily + '\'' + ", deviceType='" + deviceType
+ '\'' + ", softwareVersion='" + softwareVersion + '\'' + ", online=" + online + ", capabilities="
+ Arrays.toString(capabilities) + '}';
}
} }
public @Nullable Device @Nullable [] devices; public List<Device> devices = List.of();
} }