Commit e51a04863a18323b709d55d8a3e047d3ade966da
1 parent
86018bba
Refactoring of entity relations query
Showing
13 changed files
with
24 additions
and
26 deletions
| ... | ... | @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.EntityIdFactory; |
| 23 | 23 | import org.thingsboard.server.common.data.relation.EntityRelation; |
| 24 | 24 | import org.thingsboard.server.common.data.relation.EntityRelationInfo; |
| 25 | 25 | import org.thingsboard.server.common.data.relation.RelationTypeGroup; |
| 26 | -import org.thingsboard.server.dao.relation.EntityRelationsQuery; | |
| 26 | +import org.thingsboard.server.common.data.relation.EntityRelationsQuery; | |
| 27 | 27 | import org.thingsboard.server.exception.ThingsboardErrorCode; |
| 28 | 28 | import org.thingsboard.server.exception.ThingsboardException; |
| 29 | 29 | ... | ... |
common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelationsQuery.java
renamed from
dao/src/main/java/org/thingsboard/server/dao/relation/EntityRelationsQuery.java
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | * See the License for the specific language governing permissions and |
| 14 | 14 | * limitations under the License. |
| 15 | 15 | */ |
| 16 | -package org.thingsboard.server.dao.relation; | |
| 16 | +package org.thingsboard.server.common.data.relation; | |
| 17 | 17 | |
| 18 | 18 | import lombok.Data; |
| 19 | 19 | ... | ... |
common/data/src/main/java/org/thingsboard/server/common/data/relation/EntitySearchDirection.java
renamed from
dao/src/main/java/org/thingsboard/server/dao/relation/EntitySearchDirection.java
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | * See the License for the specific language governing permissions and |
| 14 | 14 | * limitations under the License. |
| 15 | 15 | */ |
| 16 | -package org.thingsboard.server.dao.relation; | |
| 16 | +package org.thingsboard.server.common.data.relation; | |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * Created by ashvayka on 02.05.17. | ... | ... |
common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityTypeFilter.java
renamed from
dao/src/main/java/org/thingsboard/server/dao/relation/EntityTypeFilter.java
| ... | ... | @@ -13,13 +13,12 @@ |
| 13 | 13 | * See the License for the specific language governing permissions and |
| 14 | 14 | * limitations under the License. |
| 15 | 15 | */ |
| 16 | -package org.thingsboard.server.dao.relation; | |
| 16 | +package org.thingsboard.server.common.data.relation; | |
| 17 | 17 | |
| 18 | 18 | import lombok.AllArgsConstructor; |
| 19 | 19 | import lombok.Data; |
| 20 | 20 | import org.thingsboard.server.common.data.EntityType; |
| 21 | 21 | |
| 22 | -import javax.annotation.Nullable; | |
| 23 | 22 | import java.util.List; |
| 24 | 23 | |
| 25 | 24 | /** |
| ... | ... | @@ -28,8 +27,8 @@ import java.util.List; |
| 28 | 27 | @Data |
| 29 | 28 | @AllArgsConstructor |
| 30 | 29 | public class EntityTypeFilter { |
| 31 | - @Nullable | |
| 30 | + | |
| 32 | 31 | private String relationType; |
| 33 | - @Nullable | |
| 32 | + | |
| 34 | 33 | private List<EntityType> entityTypes; |
| 35 | 34 | } | ... | ... |
common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationsSearchParameters.java
renamed from
dao/src/main/java/org/thingsboard/server/dao/relation/RelationsSearchParameters.java
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | * See the License for the specific language governing permissions and |
| 14 | 14 | * limitations under the License. |
| 15 | 15 | */ |
| 16 | -package org.thingsboard.server.dao.relation; | |
| 16 | +package org.thingsboard.server.common.data.relation; | |
| 17 | 17 | |
| 18 | 18 | import lombok.AllArgsConstructor; |
| 19 | 19 | import lombok.Data; | ... | ... |
| ... | ... | @@ -35,10 +35,10 @@ import org.thingsboard.server.common.data.relation.RelationTypeGroup; |
| 35 | 35 | import org.thingsboard.server.dao.entity.AbstractEntityService; |
| 36 | 36 | import org.thingsboard.server.dao.entity.EntityService; |
| 37 | 37 | import org.thingsboard.server.dao.exception.DataValidationException; |
| 38 | -import org.thingsboard.server.dao.relation.EntityRelationsQuery; | |
| 39 | -import org.thingsboard.server.dao.relation.EntitySearchDirection; | |
| 38 | +import org.thingsboard.server.common.data.relation.EntityRelationsQuery; | |
| 39 | +import org.thingsboard.server.common.data.relation.EntitySearchDirection; | |
| 40 | 40 | import org.thingsboard.server.dao.relation.RelationService; |
| 41 | -import org.thingsboard.server.dao.relation.RelationsSearchParameters; | |
| 41 | +import org.thingsboard.server.common.data.relation.RelationsSearchParameters; | |
| 42 | 42 | import org.thingsboard.server.dao.service.DataValidator; |
| 43 | 43 | import org.thingsboard.server.dao.tenant.TenantDao; |
| 44 | 44 | ... | ... |
| ... | ... | @@ -18,9 +18,9 @@ package org.thingsboard.server.dao.asset; |
| 18 | 18 | import lombok.Data; |
| 19 | 19 | import org.thingsboard.server.common.data.EntityType; |
| 20 | 20 | import org.thingsboard.server.common.data.relation.EntityRelation; |
| 21 | -import org.thingsboard.server.dao.relation.EntityRelationsQuery; | |
| 22 | -import org.thingsboard.server.dao.relation.EntityTypeFilter; | |
| 23 | -import org.thingsboard.server.dao.relation.RelationsSearchParameters; | |
| 21 | +import org.thingsboard.server.common.data.relation.EntityRelationsQuery; | |
| 22 | +import org.thingsboard.server.common.data.relation.EntityTypeFilter; | |
| 23 | +import org.thingsboard.server.common.data.relation.RelationsSearchParameters; | |
| 24 | 24 | |
| 25 | 25 | import javax.annotation.Nullable; |
| 26 | 26 | import java.util.Collections; | ... | ... |
| ... | ... | @@ -39,7 +39,7 @@ import org.thingsboard.server.common.data.relation.EntityRelation; |
| 39 | 39 | import org.thingsboard.server.dao.customer.CustomerDao; |
| 40 | 40 | import org.thingsboard.server.dao.entity.AbstractEntityService; |
| 41 | 41 | import org.thingsboard.server.dao.exception.DataValidationException; |
| 42 | -import org.thingsboard.server.dao.relation.EntitySearchDirection; | |
| 42 | +import org.thingsboard.server.common.data.relation.EntitySearchDirection; | |
| 43 | 43 | import org.thingsboard.server.dao.service.DataValidator; |
| 44 | 44 | import org.thingsboard.server.dao.service.PaginatedRemover; |
| 45 | 45 | import org.thingsboard.server.dao.tenant.TenantDao; | ... | ... |
| ... | ... | @@ -18,9 +18,9 @@ package org.thingsboard.server.dao.device; |
| 18 | 18 | import lombok.Data; |
| 19 | 19 | import org.thingsboard.server.common.data.EntityType; |
| 20 | 20 | import org.thingsboard.server.common.data.relation.EntityRelation; |
| 21 | -import org.thingsboard.server.dao.relation.EntityRelationsQuery; | |
| 22 | -import org.thingsboard.server.dao.relation.EntityTypeFilter; | |
| 23 | -import org.thingsboard.server.dao.relation.RelationsSearchParameters; | |
| 21 | +import org.thingsboard.server.common.data.relation.EntityRelationsQuery; | |
| 22 | +import org.thingsboard.server.common.data.relation.EntityTypeFilter; | |
| 23 | +import org.thingsboard.server.common.data.relation.RelationsSearchParameters; | |
| 24 | 24 | |
| 25 | 25 | import javax.annotation.Nullable; |
| 26 | 26 | import java.util.Collections; | ... | ... |
| ... | ... | @@ -37,7 +37,7 @@ import org.thingsboard.server.common.data.security.DeviceCredentialsType; |
| 37 | 37 | import org.thingsboard.server.dao.customer.CustomerDao; |
| 38 | 38 | import org.thingsboard.server.dao.entity.AbstractEntityService; |
| 39 | 39 | import org.thingsboard.server.dao.exception.DataValidationException; |
| 40 | -import org.thingsboard.server.dao.relation.EntitySearchDirection; | |
| 40 | +import org.thingsboard.server.common.data.relation.EntitySearchDirection; | |
| 41 | 41 | import org.thingsboard.server.dao.service.DataValidator; |
| 42 | 42 | import org.thingsboard.server.dao.service.PaginatedRemover; |
| 43 | 43 | import org.thingsboard.server.dao.tenant.TenantDao; | ... | ... |
| ... | ... | @@ -24,9 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
| 24 | 24 | import org.springframework.stereotype.Service; |
| 25 | 25 | import org.springframework.util.StringUtils; |
| 26 | 26 | import org.thingsboard.server.common.data.id.EntityId; |
| 27 | -import org.thingsboard.server.common.data.relation.EntityRelation; | |
| 28 | -import org.thingsboard.server.common.data.relation.EntityRelationInfo; | |
| 29 | -import org.thingsboard.server.common.data.relation.RelationTypeGroup; | |
| 27 | +import org.thingsboard.server.common.data.relation.*; | |
| 30 | 28 | import org.thingsboard.server.dao.entity.EntityService; |
| 31 | 29 | import org.thingsboard.server.dao.exception.DataValidationException; |
| 32 | 30 | ... | ... |
| ... | ... | @@ -19,6 +19,7 @@ import com.google.common.util.concurrent.ListenableFuture; |
| 19 | 19 | import org.thingsboard.server.common.data.id.EntityId; |
| 20 | 20 | import org.thingsboard.server.common.data.relation.EntityRelation; |
| 21 | 21 | import org.thingsboard.server.common.data.relation.EntityRelationInfo; |
| 22 | +import org.thingsboard.server.common.data.relation.EntityRelationsQuery; | |
| 22 | 23 | import org.thingsboard.server.common.data.relation.RelationTypeGroup; |
| 23 | 24 | |
| 24 | 25 | import java.util.List; | ... | ... |
| ... | ... | @@ -26,10 +26,10 @@ import org.thingsboard.server.common.data.id.DeviceId; |
| 26 | 26 | import org.thingsboard.server.common.data.relation.EntityRelation; |
| 27 | 27 | import org.thingsboard.server.common.data.relation.RelationTypeGroup; |
| 28 | 28 | import org.thingsboard.server.dao.exception.DataValidationException; |
| 29 | -import org.thingsboard.server.dao.relation.EntityRelationsQuery; | |
| 30 | -import org.thingsboard.server.dao.relation.EntitySearchDirection; | |
| 31 | -import org.thingsboard.server.dao.relation.EntityTypeFilter; | |
| 32 | -import org.thingsboard.server.dao.relation.RelationsSearchParameters; | |
| 29 | +import org.thingsboard.server.common.data.relation.EntityRelationsQuery; | |
| 30 | +import org.thingsboard.server.common.data.relation.EntitySearchDirection; | |
| 31 | +import org.thingsboard.server.common.data.relation.EntityTypeFilter; | |
| 32 | +import org.thingsboard.server.common.data.relation.RelationsSearchParameters; | |
| 33 | 33 | |
| 34 | 34 | import java.util.Collections; |
| 35 | 35 | import java.util.List; | ... | ... |