From 133856b35b02f2850bc1482621e6bbd9636b3924 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Thu, 2 Feb 2023 13:18:47 +0200
Subject: [PATCH] Added @JsonIgnore interface for newly added list of subtypes
 - for backward compatibility

---
 .../thingsboard/server/common/data/query/AssetTypeFilter.java   | 2 ++
 .../thingsboard/server/common/data/query/DeviceTypeFilter.java  | 2 ++
 .../thingsboard/server/common/data/query/EdgeTypeFilter.java    | 2 ++
 .../server/common/data/query/EntityViewTypeFilter.java          | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
index 55bbf3b810..6212e80c8a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.util.List;
@@ -28,6 +29,7 @@ public class AssetTypeFilter implements EntityFilter {
     @Deprecated(since = "3.5", forRemoval = true)
     private String assetType;
 
+    @JsonIgnore
     private List<String> assetTypes;
 
     private String assetNameFilter;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
index dfb0771fc5..adc7a2de04 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -32,6 +33,7 @@ public class DeviceTypeFilter implements EntityFilter {
     @Deprecated(since = "3.5", forRemoval = true)
     private String deviceType;
 
+    @JsonIgnore
     private List<String> deviceTypes;
 
     private String deviceNameFilter;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
index 7dbcb8ce34..e31dedecfa 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.util.List;
@@ -28,6 +29,7 @@ public class EdgeTypeFilter implements EntityFilter {
     @Deprecated(since = "3.5", forRemoval = true)
     private String edgeType;
 
+    @JsonIgnore
     private List<String> edgeTypes;
 
     private String edgeNameFilter;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
index ad3d8af9e5..509b4660a5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.common.data.query;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.util.List;
@@ -28,6 +29,7 @@ public class EntityViewTypeFilter implements EntityFilter {
     @Deprecated(since = "3.5", forRemoval = true)
     private String entityViewType;
 
+    @JsonIgnore
     private List<String> entityViewTypes;
 
     private String entityViewNameFilter;