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

Fix DS Type update to do not remove mandatory/optional module types (#2598)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-08-07 14:29:54 +03:00
committed by GitHub
parent e2beb898f8
commit 08ff739bbe
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java
View File

@@ -811,11 +811,13 @@ class MgmtDistributionSetTypeResourceTest extends AbstractManagementApiIntegrati
.build(), .build(),
DistributionSetTypeManagement.Create.builder() DistributionSetTypeManagement.Create.builder()
.key("testKey2").name("TestName2").description("Desc2").colour("col") .key("testKey2").name("TestName2").description("Desc2").colour("col")
.mandatoryModuleTypes(Set.of())
.optionalModuleTypes(Set.of(runtimeType, osType, appType)) .optionalModuleTypes(Set.of(runtimeType, osType, appType))
.build(), .build(),
DistributionSetTypeManagement.Create.builder() DistributionSetTypeManagement.Create.builder()
.key("testKey3").name("TestName3").description("Desc3").colour("col") .key("testKey3").name("TestName3").description("Desc3").colour("col")
.mandatoryModuleTypes(Set.of(runtimeType, osType)) .mandatoryModuleTypes(Set.of(runtimeType, osType))
.optionalModuleTypes(Set.of())
.build()); .build());
} }

9
hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java
View File

@@ -3015,15 +3015,12 @@ class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest {
assertThat(targetManagement.isControllerAttributesRequested(knownTargetId)).isTrue(); assertThat(targetManagement.isControllerAttributesRequested(knownTargetId)).isTrue();
} }
private String getCreateTargetsListJsonString(final String controllerId, final String name, private String getCreateTargetsListJsonString(final String controllerId, final String name, final String description) {
final String description) { return "[{\"name\":\"" + name + "\",\"controllerId\":\"" + controllerId + "\",\"description\":\"" + description + "\"}]";
return "[{\"name\":\"" + name + "\",\"controllerId\":\"" + controllerId + "\",\"description\":\"" + description
+ "\"}]";
} }
private Target createSingleTarget(final String controllerId, final String name) { private Target createSingleTarget(final String controllerId, final String name) {
targetManagement.create(entityFactory.target().create().controllerId(controllerId).name(name) targetManagement.create(entityFactory.target().create().controllerId(controllerId).name(name).description(TARGET_DESCRIPTION_TEST));
.description(TARGET_DESCRIPTION_TEST));
return controllerManagement.findOrRegisterTargetIfItDoesNotExist(controllerId, LOCALHOST); return controllerManagement.findOrRegisterTargetIfItDoesNotExist(controllerId, LOCALHOST);
} }

7
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeManagement.java
View File

@@ -17,7 +17,6 @@ import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.Builder;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.ToString; import lombok.ToString;
@@ -125,9 +124,7 @@ public interface DistributionSetTypeManagement<T extends DistributionSetType>
@Size(max = Type.COLOUR_MAX_SIZE) @Size(max = Type.COLOUR_MAX_SIZE)
private String colour; private String colour;
@Builder.Default private Set<? extends SoftwareModuleType> mandatoryModuleTypes;
private Set<? extends SoftwareModuleType> mandatoryModuleTypes = Set.of(); private Set<? extends SoftwareModuleType> optionalModuleTypes;
@Builder.Default
private Set<? extends SoftwareModuleType> optionalModuleTypes = Set.of();
} }
} }

4
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetTypeManagementTest.java
View File

@@ -50,7 +50,7 @@ import org.junit.jupiter.api.Test;
class DistributionSetTypeManagementTest extends AbstractJpaIntegrationTest { class DistributionSetTypeManagementTest extends AbstractJpaIntegrationTest {
/** /**
* Verifies that management get access react as specfied on calls for non existing entities by means * Verifies that management get access react as specified on calls for non existing entities by means
* of Optional not present. * of Optional not present.
*/ */
@Test @Test
@@ -62,7 +62,7 @@ class DistributionSetTypeManagementTest extends AbstractJpaIntegrationTest {
} }
/** /**
* Verifies that management queries react as specfied on calls for non existing entities * Verifies that management queries react as specified on calls for non existing entities
* by means of throwing EntityNotFoundException. * by means of throwing EntityNotFoundException.
*/ */
@Test @Test