Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Action active field convertor JPA Vendor portable #2132

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Make Action active field convertor JPA Vendor portable #2132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public String[] possibleValues(final ActionFields e) {
private static Object convertStatusValue(final String value) {
final String trimmedValue = value.trim();
if (trimmedValue.equalsIgnoreCase(ACTIVE)) {
return 1;
return true;
} else if (trimmedValue.equalsIgnoreCase(INACTIVE)) {
return 0;
return false;
} else {
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion ...rg/eclipse/hawkbit/repository/jpa/acm/controller/DistributionSetAccessControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void verifyTagFilteringAndManagement() {
assertThat(distributionSetManagement.findByTag(Pageable.unpaged(), dsTag.getId()).get().map(Identifiable::getId)
.toList()).containsOnly(permitted.getId(), readOnly.getId());

assertThat(distributionSetManagement.findByRsqlAndTag(Pageable.unpaged(), "id==*", dsTag.getId()).get()
assertThat(distributionSetManagement.findByRsqlAndTag(Pageable.unpaged(), "name==*", dsTag.getId()).get()
.map(Identifiable::getId).toList()).containsOnly(permitted.getId(), readOnly.getId());

// verify distributionSetManagement#unassignTag on permitted target
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/eclipse/hawkbit/repository/jpa/acm/controller/TargetTypeAccessControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void verifyTargetTypeReadOperations() {
.containsOnly(permittedTargetType.getId());

// verify targetTypeManagement#findByRsql
assertThat(targetTypeManagement.findByRsql(Pageable.unpaged(), "id==*").get().map(Identifiable::getId).toList())
assertThat(targetTypeManagement.findByRsql(Pageable.unpaged(), "name==*").get().map(Identifiable::getId).toList())
.containsOnly(permittedTargetType.getId());

// verify targetTypeManagement#findByName
Expand Down
Loading