From 8b3a6f084d1738ed13665e15c1e55a947f1a1e89 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Fri, 8 Mar 2024 15:44:10 +0200 Subject: [PATCH] [#1651] Fix tag config - case insensitive (test) (#1681) Signed-off-by: Marinov Avgustin --- .../jpa/management/JpaDistributionSetManagement.java | 2 +- .../jpa/management/DistributionSetManagementTest.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java index 8bec5c902..2dc708812 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java @@ -832,7 +832,7 @@ public class JpaDistributionSetManagement implements DistributionSetManagement { final List skipForTags = repositoryProperties.getSkipImplicitLockForTags(); if (!ObjectUtils.isEmpty(skipForTags)) { - final Set tags = ((JpaDistributionSet)jpaDistributionSet).getTags(); + final Set tags = jpaDistributionSet.getTags(); if (!ObjectUtils.isEmpty(tags)) { for (final DistributionSetTag tag : tags) { if (skipForTags.contains(tag.getName())) { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetManagementTest.java index b3462f7d9..2468e89e2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetManagementTest.java @@ -1069,7 +1069,7 @@ class DistributionSetManagementTest extends AbstractJpaIntegrationTest { @Autowired RepositoryProperties repositoryProperties; @Test @Description("Test implicit locks for a DS and skip tags.") - void isImplicitLockApplicableDistributionSet() { + void isImplicitLockApplicableForDistributionSet() { final JpaDistributionSetManagement distributionSetManagement = (JpaDistributionSetManagement)this.distributionSetManagement; final DistributionSet distributionSet = testdataFactory.createDistributionSet("ds-non-skip"); @@ -1079,6 +1079,10 @@ class DistributionSetManagementTest extends AbstractJpaIntegrationTest { assertThat(repositoryProperties.getSkipImplicitLockForTags().size()).isNotEqualTo(0); final List skipTags = distributionSetTagManagement.create( 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)) .toList()); // assert that implicit lock locks for every skip tag