Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Improve test robustness

Rich Turner490a4e162dca
diff --git a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusClient.java b/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusClient.java
index 8714ed0fe..4a3f2abf2 100644
--- a/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusClient.java
+++ b/test/src/main/groovy/org/openremote/test/protocol/velbus/MockVelbusClient.java
@@ -33,7 +33,7 @@ import java.util.function.Supplier;
public class MockVelbusClient implements IoClient<VelbusPacket> {
protected final List<Consumer<VelbusPacket>> messageConsumers = new ArrayList<>();
protected final List<Consumer<ConnectionStatus>> statusConsumers = new ArrayList<>();
- protected List<VelbusPacket> sentMessages = new ArrayList<>();
+ protected List<String> sentMessages = new ArrayList<>();
protected ConnectionStatus connectionStatus = ConnectionStatus.DISCONNECTED;
protected Map<String, List<String>> mockPackets;
@@ -51,7 +51,7 @@ public class MockVelbusClient implements IoClient<VelbusPacket> {
@Override
public void sendMessage(VelbusPacket message) {
- sentMessages.add(message);
+ sentMessages.add(message.toString());
// If a mock packet mapping exists for this then return the result
if (mockPackets != null) {
diff --git a/ui/component/model/src/main/java/EnumWithInterfacesExtension.java b/ui/component/model/src/main/java/EnumWithInterfacesExtension.java
index 8b7475638..4ca746796 100644
--- a/ui/component/model/src/main/java/EnumWithInterfacesExtension.java
+++ b/ui/component/model/src/main/java/EnumWithInterfacesExtension.java
@@ -1,4 +1,6 @@
-import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
@@ -12,11 +14,8 @@ import cz.habarta.typescript.generator.compiler.ModelCompiler;
import cz.habarta.typescript.generator.compiler.ModelTransformer;
import cz.habarta.typescript.generator.compiler.SymbolTable;
import cz.habarta.typescript.generator.emitter.*;
-import cz.habarta.typescript.generator.parser.BeanModel;
-import cz.habarta.typescript.generator.parser.Model;
import cz.habarta.typescript.generator.util.Pair;
import cz.habarta.typescript.generator.util.Utils;
-import org.openremote.model.asset.Asset;
import java.io.IOException;
import java.lang.annotation.Annotation;
@@ -75,6 +74,7 @@ import java.util.stream.Collectors;
* </pre></blockquote>
* <a href="https://github.com/vojtechhabarta/typescript-generator/issues/299">https://github.com/vojtechhabarta/typescript-generator/issues/299</a>
*/
+@SuppressWarnings("deprecation")
public class EnumWithInterfacesExtension extends Extension {
public static class EnumInterfaceModel {
diff --git a/ui/component/model/src/main/java/JsonSerializeExtension.java b/ui/component/model/src/main/java/JsonSerializeExtension.java
index 908971907..3d11a092c 100644
--- a/ui/component/model/src/main/java/JsonSerializeExtension.java
+++ b/ui/component/model/src/main/java/JsonSerializeExtension.java
@@ -44,6 +44,7 @@ import java.util.stream.Collectors;
* <li>{@link JsonSerialize#converter}</li>
* </ul>
*/
+@SuppressWarnings("deprecation")
public class JsonSerializeExtension extends cz.habarta.typescript.generator.Extension {
@Override