From 98f52571a2e551640c2e455e0268e8fb9b1c3d58 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Mon, 28 Aug 2017 18:59:36 +0300 Subject: [PATCH] Move DeviceSearchQuery to common/data --- .../server/common/data/device/DeviceSearchQuery.java | 3 --- 1 file changed, 3 deletions(-) rename {dao => common/data}/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java (96%) diff --git a/dao/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java similarity index 96% rename from dao/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java rename to common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java index 76b696fdae..243eeb77cf 100644 --- a/dao/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/DeviceSearchQuery.java @@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.relation.EntityRelationsQuery; import org.thingsboard.server.common.data.relation.EntityTypeFilter; import org.thingsboard.server.common.data.relation.RelationsSearchParameters; -import javax.annotation.Nullable; import java.util.Collections; import java.util.List; @@ -30,9 +29,7 @@ import java.util.List; public class DeviceSearchQuery { private RelationsSearchParameters parameters; - @Nullable private String relationType; - @Nullable private List deviceTypes; public EntityRelationsQuery toEntitySearchQuery() {