Code refactoring of hawkbit-repository (#2056)
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
@@ -19,7 +19,6 @@ import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import io.qameta.allure.Description;
|
||||
|
||||
@@ -47,7 +47,7 @@ import org.springframework.util.CollectionUtils;
|
||||
class RolloutGroupManagementTest extends AbstractJpaIntegrationTest {
|
||||
|
||||
@Test
|
||||
@Description("Verifies that management get access reacts as specified on calls for non existing entities by means " +
|
||||
@Description("Verifies that management get access reacts as specified on calls for non existing entities by means " +
|
||||
"of Optional not present.")
|
||||
@ExpectEvents({ @Expect(type = TargetCreatedEvent.class, count = 0) })
|
||||
void nonExistingEntityAccessReturnsNotPresent() {
|
||||
@@ -227,7 +227,7 @@ class RolloutGroupManagementTest extends AbstractJpaIntegrationTest {
|
||||
final JpaRolloutGroup rolloutGroup = ((JpaRolloutGroup) rolloutGroupManagement.get(id).orElseThrow());
|
||||
rolloutGroup.setStatus(status);
|
||||
rolloutGroupRepository.save(rolloutGroup);
|
||||
assertThat( rolloutGroupManagement.get(id).orElseThrow().getStatus()).isEqualTo(status);
|
||||
assertThat(rolloutGroupManagement.get(id).orElseThrow().getStatus()).isEqualTo(status);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2086,7 +2086,7 @@ class RolloutManagementTest extends AbstractJpaIntegrationTest {
|
||||
void testRolloutStatusConvert() {
|
||||
final long id = testdataFactory.createAndStartRollout(1, 0, 1, "100", "80").getId();
|
||||
for (final RolloutStatus status : RolloutStatus.values()) {
|
||||
final JpaRollout rollout = ((JpaRollout)rolloutManagement.get(id).orElseThrow());
|
||||
final JpaRollout rollout = ((JpaRollout) rolloutManagement.get(id).orElseThrow());
|
||||
rollout.setStatus(status);
|
||||
rolloutRepository.save(rollout);
|
||||
assertThat(rolloutManagement.get(id).orElseThrow().getStatus()).isEqualTo(status);
|
||||
@@ -2098,7 +2098,7 @@ class RolloutManagementTest extends AbstractJpaIntegrationTest {
|
||||
void testActionTypeConvert() {
|
||||
final long id = testdataFactory.createAndStartRollout(1, 0, 1, "100", "80").getId();
|
||||
for (final ActionType actionType : ActionType.values()) {
|
||||
final JpaRollout rollout = ((JpaRollout)rolloutManagement.get(id).orElseThrow());
|
||||
final JpaRollout rollout = ((JpaRollout) rolloutManagement.get(id).orElseThrow());
|
||||
rollout.setActionType(actionType);
|
||||
rolloutRepository.save(rollout);
|
||||
assertThat(rolloutManagement.get(id).orElseThrow().getActionType()).isEqualTo(actionType);
|
||||
|
||||
@@ -21,11 +21,11 @@ import io.qameta.allure.Description;
|
||||
import io.qameta.allure.Feature;
|
||||
import io.qameta.allure.Story;
|
||||
import org.eclipse.hawkbit.repository.exception.InvalidTenantConfigurationKeyException;
|
||||
import org.eclipse.hawkbit.repository.exception.TenantConfigurationValidatorException;
|
||||
import org.eclipse.hawkbit.repository.jpa.AbstractJpaIntegrationTest;
|
||||
import org.eclipse.hawkbit.repository.model.TenantConfigurationValue;
|
||||
import org.eclipse.hawkbit.tenancy.configuration.DurationHelper;
|
||||
import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey;
|
||||
import org.eclipse.hawkbit.repository.exception.TenantConfigurationValidatorException;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.context.EnvironmentAware;
|
||||
|
||||
Reference in New Issue
Block a user