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

[#1651] Fix tag config - case insensitive (test) (#1681)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-03-08 15:44:10 +02:00
committed by GitHub
parent 936e6d6d66
commit 8b3a6f084d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java
View File

@@ -832,7 +832,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement {
final List<String> skipForTags = repositoryProperties.getSkipImplicitLockForTags(); final List<String> skipForTags = repositoryProperties.getSkipImplicitLockForTags();
if (!ObjectUtils.isEmpty(skipForTags)) { if (!ObjectUtils.isEmpty(skipForTags)) {
final Set<DistributionSetTag> tags = ((JpaDistributionSet)jpaDistributionSet).getTags(); final Set<DistributionSetTag> tags = jpaDistributionSet.getTags();
if (!ObjectUtils.isEmpty(tags)) { if (!ObjectUtils.isEmpty(tags)) {
for (final DistributionSetTag tag : tags) { for (final DistributionSetTag tag : tags) {
if (skipForTags.contains(tag.getName())) { if (skipForTags.contains(tag.getName())) {

6
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetManagementTest.java
View File

@@ -1069,7 +1069,7 @@ class DistributionSetManagementTest extends AbstractJpaIntegrationTest {
@Autowired RepositoryProperties repositoryProperties; @Autowired RepositoryProperties repositoryProperties;
@Test @Test
@Description("Test implicit locks for a DS and skip tags.") @Description("Test implicit locks for a DS and skip tags.")
void isImplicitLockApplicableDistributionSet() { void isImplicitLockApplicableForDistributionSet() {
final JpaDistributionSetManagement distributionSetManagement = final JpaDistributionSetManagement distributionSetManagement =
(JpaDistributionSetManagement)this.distributionSetManagement; (JpaDistributionSetManagement)this.distributionSetManagement;
final DistributionSet distributionSet = testdataFactory.createDistributionSet("ds-non-skip"); final DistributionSet distributionSet = testdataFactory.createDistributionSet("ds-non-skip");
@@ -1079,6 +1079,10 @@ class DistributionSetManagementTest extends AbstractJpaIntegrationTest {
assertThat(repositoryProperties.getSkipImplicitLockForTags().size()).isNotEqualTo(0); assertThat(repositoryProperties.getSkipImplicitLockForTags().size()).isNotEqualTo(0);
final List<DistributionSetTag> skipTags = distributionSetTagManagement.create( final List<DistributionSetTag> skipTags = distributionSetTagManagement.create(
repositoryProperties.getSkipImplicitLockForTags().stream() repositoryProperties.getSkipImplicitLockForTags().stream()
.map(String::toLowerCase)
// remove same in case-insensitive terms tags
// in of case-insensitive db's it will end up as same names and constraint violation (?)
.distinct()
.map(skipTag -> entityFactory.tag().create().name(skipTag)) .map(skipTag -> entityFactory.tag().create().name(skipTag))
.toList()); .toList());
// assert that implicit lock locks for every skip tag // assert that implicit lock locks for every skip tag