From aecea7d6a56597ec586d5d46f7453d27facf74d6 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Thu, 1 Jun 2023 16:01:45 +0300 Subject: [PATCH] Removed SearchTextEntity --- .../server/common/data/SearchTextBased.java | 40 ------------------- .../server/common/data/TbResourceInfo.java | 4 +- .../server/dao/model/SearchTextEntity.java | 24 ----------- .../dao/model/sql/TbResourceEntity.java | 8 +--- .../dao/model/sql/TbResourceInfoEntity.java | 9 +---- .../dao/sql/JpaAbstractSearchTextDao.java | 30 -------------- .../dao/sql/resource/JpaTbResourceDao.java | 4 +- .../sql/resource/JpaTbResourceInfoDao.java | 4 +- 8 files changed, 10 insertions(+), 113 deletions(-) delete mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/SearchTextBased.java delete mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/SearchTextEntity.java delete mode 100644 dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/SearchTextBased.java b/common/data/src/main/java/org/thingsboard/server/common/data/SearchTextBased.java deleted file mode 100644 index d164a3a847..0000000000 --- a/common/data/src/main/java/org/thingsboard/server/common/data/SearchTextBased.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.common.data; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.thingsboard.server.common.data.id.UUIDBased; - -public abstract class SearchTextBased extends BaseData { - - private static final long serialVersionUID = -539812997348227609L; - - public SearchTextBased() { - super(); - } - - public SearchTextBased(I id) { - super(id); - } - - public SearchTextBased(SearchTextBased searchTextBased) { - super(searchTextBased); - } - - @JsonIgnore - public abstract String getSearchText(); - -} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java index 1f634bcb0e..331958ac58 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java @@ -30,7 +30,7 @@ import org.thingsboard.server.common.data.validation.NoXss; @Slf4j @Data @EqualsAndHashCode(callSuper = true) -public class TbResourceInfo extends SearchTextBased implements HasName, HasTenantId { +public class TbResourceInfo extends BaseData implements HasName, HasTenantId { private static final long serialVersionUID = 7282664529021651736L; @@ -87,7 +87,7 @@ public class TbResourceInfo extends SearchTextBased implements Has return title; } - @Override + @JsonIgnore public String getSearchText() { return searchText != null ? searchText : title; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/SearchTextEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/SearchTextEntity.java deleted file mode 100644 index e14fe25504..0000000000 --- a/dao/src/main/java/org/thingsboard/server/dao/model/SearchTextEntity.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.model; - -public interface SearchTextEntity extends BaseEntity { - - String getSearchTextSource(); - - void setSearchText(String searchText); - -} diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java index 1b30123b2e..1540abfe6b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceEntity.java @@ -21,8 +21,8 @@ import org.thingsboard.server.common.data.ResourceType; import org.thingsboard.server.common.data.TbResource; import org.thingsboard.server.common.data.id.TbResourceId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.BaseSqlEntity; -import org.thingsboard.server.dao.model.SearchTextEntity; import javax.persistence.Column; import javax.persistence.Entity; @@ -42,7 +42,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPER @EqualsAndHashCode(callSuper = true) @Entity @Table(name = RESOURCE_TABLE_NAME) -public class TbResourceEntity extends BaseSqlEntity implements SearchTextEntity { +public class TbResourceEntity extends BaseSqlEntity implements BaseEntity { @Column(name = RESOURCE_TENANT_ID_COLUMN, columnDefinition = "uuid") private UUID tenantId; @@ -98,8 +98,4 @@ public class TbResourceEntity extends BaseSqlEntity implements Searc return resource; } - @Override - public String getSearchTextSource() { - return this.searchText; - } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java index 5ebc0297af..54dca66657 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TbResourceInfoEntity.java @@ -21,8 +21,8 @@ import org.thingsboard.server.common.data.ResourceType; import org.thingsboard.server.common.data.TbResourceInfo; import org.thingsboard.server.common.data.id.TbResourceId; import org.thingsboard.server.common.data.id.TenantId; +import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.BaseSqlEntity; -import org.thingsboard.server.dao.model.SearchTextEntity; import javax.persistence.Column; import javax.persistence.Entity; @@ -40,7 +40,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPER @EqualsAndHashCode(callSuper = true) @Entity @Table(name = RESOURCE_TABLE_NAME) -public class TbResourceInfoEntity extends BaseSqlEntity implements SearchTextEntity { +public class TbResourceInfoEntity extends BaseSqlEntity implements BaseEntity { @Column(name = RESOURCE_TENANT_ID_COLUMN, columnDefinition = "uuid") private UUID tenantId; @@ -83,9 +83,4 @@ public class TbResourceInfoEntity extends BaseSqlEntity implemen resource.setSearchText(searchText); return resource; } - - @Override - public String getSearchTextSource() { - return title; - } } diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java deleted file mode 100644 index 6f63c67c54..0000000000 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.thingsboard.server.dao.sql; - -import org.thingsboard.server.dao.model.BaseEntity; -import org.thingsboard.server.dao.model.SearchTextEntity; - -/** - * Created by Valerii Sosliuk on 5/6/2017. - */ -public abstract class JpaAbstractSearchTextDao , D> extends JpaAbstractDao { - - @Override - protected void setSearchText(E entity) { - ((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase()); - } -} diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java index 781f1a9276..9b6ef62501 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceDao.java @@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.TbResourceEntity; import org.thingsboard.server.dao.resource.TbResourceDao; -import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.util.SqlDao; import java.util.List; @@ -37,7 +37,7 @@ import java.util.UUID; @Slf4j @Component @SqlDao -public class JpaTbResourceDao extends JpaAbstractSearchTextDao implements TbResourceDao { +public class JpaTbResourceDao extends JpaAbstractDao implements TbResourceDao { private final TbResourceRepository resourceRepository; diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java index 837ab63fb3..a80b1f48fb 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/JpaTbResourceInfoDao.java @@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.model.sql.TbResourceInfoEntity; import org.thingsboard.server.dao.resource.TbResourceInfoDao; -import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao; +import org.thingsboard.server.dao.sql.JpaAbstractDao; import org.thingsboard.server.dao.util.SqlDao; import java.util.Objects; @@ -35,7 +35,7 @@ import java.util.UUID; @Slf4j @Component @SqlDao -public class JpaTbResourceInfoDao extends JpaAbstractSearchTextDao implements TbResourceInfoDao { +public class JpaTbResourceInfoDao extends JpaAbstractDao implements TbResourceInfoDao { @Autowired private TbResourceInfoRepository resourceInfoRepository;