Commit 98f52571a2e551640c2e455e0268e8fb9b1c3d58

Authored by Igor Kulikov
1 parent 25db0b73

Move DeviceSearchQuery to common/data

common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java renamed from dao/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java
@@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.relation.EntityRelationsQuery; @@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
22 import org.thingsboard.server.common.data.relation.EntityTypeFilter; 22 import org.thingsboard.server.common.data.relation.EntityTypeFilter;
23 import org.thingsboard.server.common.data.relation.RelationsSearchParameters; 23 import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
24 24
25 -import javax.annotation.Nullable;  
26 import java.util.Collections; 25 import java.util.Collections;
27 import java.util.List; 26 import java.util.List;
28 27
@@ -30,9 +29,7 @@ import java.util.List; @@ -30,9 +29,7 @@ import java.util.List;
30 public class DeviceSearchQuery { 29 public class DeviceSearchQuery {
31 30
32 private RelationsSearchParameters parameters; 31 private RelationsSearchParameters parameters;
33 - @Nullable  
34 private String relationType; 32 private String relationType;
35 - @Nullable  
36 private List<String> deviceTypes; 33 private List<String> deviceTypes;
37 34
38 public EntityRelationsQuery toEntitySearchQuery() { 35 public EntityRelationsQuery toEntitySearchQuery() {