lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

More refactoring

Browse Source 
Signed-off-by: Stanislav Trailov <Stanislav.Trailov@bosch.io>
This commit is contained in:
Stanislav Trailov
2023-06-29 13:09:32 +03:00
parent 8bbe6df72a
commit 407ff7a3e5
6 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagManagement.java
View File

@@ -70,7 +70,4 @@ public interface DistributionSetTagManagement extends RepositoryManagement<Distr
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
Page<DistributionSetTag> findByDistributionSet(@NotNull Pageable pageable, long setId); Page<DistributionSetTag> findByDistributionSet(@NotNull Pageable pageable, long setId);
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_REPOSITORY)
Page<DistributionSetTag> findByRsqlWithDistributionSetTagSpec(@NotNull Pageable pageable, @NotNull String rsqlParam);
} }

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTagManagement.java
View File

@@ -135,9 +135,6 @@ public interface TargetTagManagement {
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
Page<TargetTag> findByRsql(@NotNull Pageable pageable, @NotNull String rsqlParam); Page<TargetTag> findByRsql(@NotNull Pageable pageable, @NotNull String rsqlParam);
@PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET)
Page<TargetTag> findByRsqlWithTargetTagSpec(@NotNull Pageable pageable, @NotNull String rsqlParam);
/** /**
* Find {@link TargetTag} based on given Name. * Find {@link TargetTag} based on given Name.
* *

11
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTagManagement.java
View File

@@ -130,7 +130,7 @@ public class JpaDistributionSetTagManagement implements DistributionSetTagManage
@Override @Override
public Page<DistributionSetTag> findByRsql(final Pageable pageable, final String rsqlParam) { public Page<DistributionSetTag> findByRsql(final Pageable pageable, final String rsqlParam) {
final Specification<JpaDistributionSetTag> spec = RSQLUtility.buildRsqlSpecification(rsqlParam, TagFields.class, final Specification<JpaDistributionSetTag> spec = RSQLUtility.buildRsqlSpecification(rsqlParam, DistributionSetTagFields.class,
virtualPropertyReplacer, database); virtualPropertyReplacer, database);
return JpaManagementHelper.findAllWithCountBySpec(distributionSetTagRepository, pageable, return JpaManagementHelper.findAllWithCountBySpec(distributionSetTagRepository, pageable,
@@ -147,15 +147,6 @@ public class JpaDistributionSetTagManagement implements DistributionSetTagManage
Collections.singletonList(TagSpecification.ofDistributionSet(setId))); Collections.singletonList(TagSpecification.ofDistributionSet(setId)));
} }
@Override
public Page<DistributionSetTag> findByRsqlWithDistributionSetTagSpec(Pageable pageable, String rsqlParam) {
final Specification<JpaDistributionSetTag> spec = RSQLUtility.buildRsqlSpecification(rsqlParam, DistributionSetTagFields.class,
virtualPropertyReplacer, database);
return JpaManagementHelper.findAllWithCountBySpec(distributionSetTagRepository, pageable,
Collections.singletonList(spec));
}
@Override @Override
@Transactional @Transactional
@Retryable(include = { @Retryable(include = {

8
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTagManagement.java
View File

@@ -106,13 +106,7 @@ public class JpaTargetTagManagement implements TargetTagManagement {
@Override @Override
public Page<TargetTag> findByRsql(final Pageable pageable, final String rsqlParam) { public Page<TargetTag> findByRsql(final Pageable pageable, final String rsqlParam) {
return JpaManagementHelper.findAllWithCountBySpec(targetTagRepository, pageable, Collections.singletonList( return JpaManagementHelper.findAllWithCountBySpec(targetTagRepository, pageable, Collections.singletonList(
RSQLUtility.buildRsqlSpecification(rsqlParam, TagFields.class, virtualPropertyReplacer, database))); RSQLUtility.buildRsqlSpecification(rsqlParam, TargetTagFields.class, virtualPropertyReplacer, database)));
}
@Override
public Page<TargetTag> findByRsqlWithTargetTagSpec(Pageable pageable, String rsqlParam) {
return JpaManagementHelper.findAllWithCountBySpec(targetTagRepository, pageable, Collections.singletonList(
RSQLUtility.buildRsqlSpecification(rsqlParam, TargetTagFields.class, virtualPropertyReplacer, database)));
} }
@Override @Override

2
hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java
View File

@@ -80,7 +80,7 @@ public class MgmtDistributionSetTagResource implements MgmtDistributionSetTagRes
count = distributionSetTagManagement.count(); count = distributionSetTagManagement.count();
} else { } else {
final Page<DistributionSetTag> page = distributionSetTagManagement.findByRsqlWithDistributionSetTagSpec(pageable, rsqlParam); final Page<DistributionSetTag> page = distributionSetTagManagement.findByRsql(pageable, rsqlParam);
distributionSetTags = page; distributionSetTags = page;
count = page.getTotalElements(); count = page.getTotalElements();

2
hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java
View File

@@ -84,7 +84,7 @@ public class MgmtTargetTagResource implements MgmtTargetTagRestApi {
findTargetsAll = this.tagManagement.findAll(pageable); findTargetsAll = this.tagManagement.findAll(pageable);
} else { } else {
findTargetsAll = this.tagManagement.findByRsqlWithTargetTagSpec(pageable, rsqlParam); findTargetsAll = this.tagManagement.findByRsql(pageable, rsqlParam);
} }