diff --git a/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAssignedVersion.java b/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAssignedVersion.java index 8fca5ce86..1b84ee7eb 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAssignedVersion.java +++ b/hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAssignedVersion.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.Getter; /** * Allow a target to declare running distribution set version diff --git a/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/AuthenticationFilters.java b/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/AuthenticationFilters.java index d64402550..dec327c45 100644 --- a/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/AuthenticationFilters.java +++ b/hawkbit-ddi/hawkbit-ddi-security/src/main/java/org/eclipse/hawkbit/security/controller/AuthenticationFilters.java @@ -62,7 +62,7 @@ public class AuthenticationFilters { * An abstraction for all controller based security to parse the e.g. the tenant name from the URL and the controller ID from the URL to do * security checks based on this information. */ - public static abstract class AbstractAuthenticationFilter extends OncePerRequestFilter { + public abstract static class AbstractAuthenticationFilter extends OncePerRequestFilter { private static final String TENANT_PLACE_HOLDER = "tenant"; private static final String CONTROLLER_ID_PLACE_HOLDER = "controllerId"; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java index 7be2bfa78..0ecbc5402 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java @@ -29,6 +29,8 @@ import org.eclipse.hawkbit.repository.SoftwareModuleManagement; import org.eclipse.hawkbit.repository.SystemManagement; import org.eclipse.hawkbit.repository.TargetManagement; import org.eclipse.hawkbit.repository.TenantConfigurationManagement; +import org.eclipse.hawkbit.repository.model.DistributionSet; +import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.springframework.amqp.core.Binding; import org.springframework.amqp.core.BindingBuilder; @@ -275,8 +277,8 @@ public class DmfApiConfiguration { final RabbitTemplate rabbitTemplate, final AmqpMessageSenderService amqpSenderService, final ArtifactUrlHandler artifactUrlHandler, final SystemSecurityContext systemSecurityContext, final SystemManagement systemManagement, - final TargetManagement targetManagement, final DistributionSetManagement distributionSetManagement, - final SoftwareModuleManagement softwareModuleManagement, final DeploymentManagement deploymentManagement, + final TargetManagement targetManagement, final DistributionSetManagement distributionSetManagement, + final SoftwareModuleManagement softwareModuleManagement, final DeploymentManagement deploymentManagement, final TenantConfigurationManagement tenantConfigurationManagement) { return new AmqpMessageDispatcherService(rabbitTemplate, amqpSenderService, artifactUrlHandler, systemSecurityContext, systemManagement, targetManagement, serviceMatcher, softwareModuleManagement, distributionSetManagement, diff --git a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfBatchDownloadAndUpdateRequest.java b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfBatchDownloadAndUpdateRequest.java index 0df56674c..271dff755 100644 --- a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfBatchDownloadAndUpdateRequest.java +++ b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfBatchDownloadAndUpdateRequest.java @@ -9,7 +9,6 @@ */ package org.eclipse.hawkbit.dmf.json.model; -import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -18,8 +17,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** * JSON representation of batch download and update request. diff --git a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfConfirmRequest.java b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfConfirmRequest.java index 841576cc4..5e0785d13 100644 --- a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfConfirmRequest.java +++ b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfConfirmRequest.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfDownloadAndUpdateRequest.java b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfDownloadAndUpdateRequest.java index b03b21ba7..be08b5ce3 100644 --- a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfDownloadAndUpdateRequest.java +++ b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfDownloadAndUpdateRequest.java @@ -9,7 +9,6 @@ */ package org.eclipse.hawkbit.dmf.json.model; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfMultiActionRequest.java b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfMultiActionRequest.java index 72df9f1ce..b02f828a4 100644 --- a/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfMultiActionRequest.java +++ b/hawkbit-dmf/hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/DmfMultiActionRequest.java @@ -9,7 +9,6 @@ */ package org.eclipse.hawkbit.dmf.json.model; -import java.util.ArrayList; import java.util.List; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java index d8b5b963b..e9a780eae 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java @@ -33,7 +33,7 @@ public class MgmtActionStatus { private Long id; @Schema(example = "running") - private StatusType type; + private Type type; private List messages; @@ -46,7 +46,7 @@ public class MgmtActionStatus { @Schema(example = "200") private Integer code; - public enum StatusType { + public enum Type { /** * Action is finished successfully for this target. @@ -116,8 +116,8 @@ public class MgmtActionStatus { } @JsonCreator - public static StatusType forValue(String s) { - return StatusType.valueOf(s.toUpperCase()); + public static Type forValue(String s) { + return Type.valueOf(s.toUpperCase()); } } } \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java b/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java index 0b42af64a..0c887bb42 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java @@ -18,7 +18,6 @@ import java.util.List; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; -import org.springframework.context.annotation.Description; /** * Feature: Tests for the MgmtTargetAssignmentResponseBody
diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java index 620042f7a..9a3f6f998 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java @@ -64,14 +64,14 @@ public class MgmtRolloutResource implements MgmtRolloutRestApi { private final RolloutManagement rolloutManagement; private final RolloutGroupManagement rolloutGroupManagement; - private final DistributionSetManagement distributionSetManagement; + private final DistributionSetManagement distributionSetManagement; private final TargetFilterQueryManagement targetFilterQueryManagement; private final EntityFactory entityFactory; private final TenantConfigHelper tenantConfigHelper; MgmtRolloutResource( final RolloutManagement rolloutManagement, final RolloutGroupManagement rolloutGroupManagement, - final DistributionSetManagement distributionSetManagement, + final DistributionSetManagement distributionSetManagement, final TargetFilterQueryManagement targetFilterQueryManagement, final EntityFactory entityFactory, final SystemSecurityContext systemSecurityContext, final TenantConfigurationManagement tenantConfigurationManagement) { diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java index 2b74079fb..dc4f28a94 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java @@ -21,7 +21,6 @@ import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModule import org.eclipse.hawkbit.mgmt.rest.api.MgmtSoftwareModuleTypeRestApi; import org.eclipse.hawkbit.mgmt.rest.resource.mapper.MgmtSoftwareModuleTypeMapper; import org.eclipse.hawkbit.mgmt.rest.resource.util.PagingUtility; -import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.SoftwareModuleTypeManagement; import org.eclipse.hawkbit.repository.exception.EntityNotFoundException; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/mapper/MgmtTargetMapper.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/mapper/MgmtTargetMapper.java index 05df491cd..c0692e309 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/mapper/MgmtTargetMapper.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/mapper/MgmtTargetMapper.java @@ -346,7 +346,7 @@ public final class MgmtTargetMapper { result.setReportedAt(actionStatus.getCreatedAt()); result.setTimestamp(actionStatus.getOccurredAt()); result.setId(actionStatus.getId()); - result.setType(MgmtActionStatus.StatusType.forValue(actionStatus.getStatus().name())); + result.setType(MgmtActionStatus.Type.forValue(actionStatus.getStatus().name())); actionStatus.getCode().ifPresent(result::setCode); return result; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java index d4c5bbf07..98de3bde6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java @@ -380,6 +380,7 @@ public interface DistributionSetManagement return this; } + @SuppressWarnings("java:S3400") // java:S3400 it's used via reflection public boolean isValid() { return true; } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java index fbcb0d782..b86c021a0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.Map; import java.util.stream.Collectors; -import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java index 70f21fe44..c0e3545d0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java @@ -9,7 +9,6 @@ */ package org.eclipse.hawkbit.repository.model; -import java.util.Optional; import java.util.Set; /** diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java index ee3a4989c..299d5c2b9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRepositoryConfiguration.java @@ -103,6 +103,8 @@ import org.eclipse.hawkbit.repository.jpa.rollout.condition.StartNextGroupRollou import org.eclipse.hawkbit.repository.jpa.rollout.condition.ThresholdRolloutGroupErrorCondition; import org.eclipse.hawkbit.repository.jpa.rollout.condition.ThresholdRolloutGroupSuccessCondition; import org.eclipse.hawkbit.repository.jpa.rsql.RsqlUtility; +import org.eclipse.hawkbit.repository.model.DistributionSet; +import org.eclipse.hawkbit.repository.model.DistributionSetType; import org.eclipse.hawkbit.repository.model.Rollout; import org.eclipse.hawkbit.repository.model.RolloutGroup; import org.eclipse.hawkbit.repository.model.SoftwareModule; @@ -148,8 +150,6 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; -; - /** * General configuration for hawkBit's Repository. */ @@ -319,7 +319,7 @@ public class JpaRepositoryConfiguration { * @return TargetTypeBuilder bean */ @Bean - TargetTypeBuilder targetTypeBuilder(final DistributionSetTypeManagement dsTypeManagement) { + TargetTypeBuilder targetTypeBuilder(final DistributionSetTypeManagement dsTypeManagement) { return new JpaTargetTypeBuilder(dsTypeManagement); } @@ -334,7 +334,7 @@ public class JpaRepositoryConfiguration { * @return RolloutBuilder bean */ @Bean - RolloutBuilder rolloutBuilder(final DistributionSetManagement distributionSetManagement) { + RolloutBuilder rolloutBuilder(final DistributionSetManagement distributionSetManagement) { return new JpaRolloutBuilder(distributionSetManagement); } @@ -344,7 +344,7 @@ public class JpaRepositoryConfiguration { * @return TargetFilterQueryBuilder bean */ @Bean - TargetFilterQueryBuilder targetFilterQueryBuilder(final DistributionSetManagement distributionSetManagement) { + TargetFilterQueryBuilder targetFilterQueryBuilder(final DistributionSetManagement distributionSetManagement) { return new JpaTargetFilterQueryBuilder(distributionSetManagement); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java index 21fd99bae..29aadec66 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java @@ -78,7 +78,7 @@ public class SystemManagementCacheKeyGenerator implements CurrentTenantCacheKeyG @Override public Object generate(final Object target, final Method method, final Object... params) { - String tenant = getTenantInCreation().orElseGet(() -> tenantAware.getCurrentTenant()).toUpperCase(); + String tenant = getTenantInCreation().orElseGet(tenantAware::getCurrentTenant).toUpperCase(); return SimpleKeyGenerator.generateKey(tenant, tenant); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java index 81d1b6370..1f4638ac0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java @@ -14,6 +14,7 @@ import org.eclipse.hawkbit.repository.builder.GenericRolloutUpdate; import org.eclipse.hawkbit.repository.builder.RolloutBuilder; import org.eclipse.hawkbit.repository.builder.RolloutCreate; import org.eclipse.hawkbit.repository.builder.RolloutUpdate; +import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.Rollout; /** @@ -21,9 +22,9 @@ import org.eclipse.hawkbit.repository.model.Rollout; */ public class JpaRolloutBuilder implements RolloutBuilder { - private final DistributionSetManagement distributionSetManagement; + private final DistributionSetManagement distributionSetManagement; - public JpaRolloutBuilder(final DistributionSetManagement distributionSetManagement) { + public JpaRolloutBuilder(final DistributionSetManagement distributionSetManagement) { this.distributionSetManagement = distributionSetManagement; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java index 9bb843657..0e9f9f63d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java @@ -33,19 +33,13 @@ public class JpaRolloutCreate extends AbstractNamedEntityBuilder @Min(Action.WEIGHT_MIN) @Max(Action.WEIGHT_MAX) protected Integer weight; - private final DistributionSetManagement distributionSetManagement; + private final DistributionSetManagement distributionSetManagement; private boolean dynamic; - JpaRolloutCreate(final DistributionSetManagement distributionSetManagement) { + JpaRolloutCreate(final DistributionSetManagement distributionSetManagement) { this.distributionSetManagement = distributionSetManagement; } - /** - * {@link DistributionSet} of rollout - * - * @param distributionSetId ID of the distributionSetId - * @return this builder - */ public RolloutCreate distributionSetId(final long distributionSetId) { this.distributionSetId = distributionSetId; return this; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java index db11e9771..437b2e82e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java @@ -21,8 +21,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModule; * Create/build implementation. */ public class JpaSoftwareModuleMetadataCreate - extends AbstractSoftwareModuleMetadataUpdateCreate - implements SoftwareModuleMetadataCreate { + extends AbstractSoftwareModuleMetadataUpdateCreate implements SoftwareModuleMetadataCreate { private final JpaSoftwareModuleManagement softwareModuleManagement; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java index 0c5dd0e98..ef16f9b28 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java @@ -22,9 +22,6 @@ public class JpaTargetBuilder implements TargetBuilder { private final TargetTypeManagement targetTypeManagement; - /** - * @param targetTypeManagement Target type management - */ public JpaTargetBuilder(TargetTypeManagement targetTypeManagement) { this.targetTypeManagement = targetTypeManagement; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java index 7a89dbf2c..060abfdd9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java @@ -25,11 +25,6 @@ public class JpaTargetCreate extends AbstractTargetUpdateCreate im private final TargetTypeManagement targetTypeManagement; - /** - * Constructor - * - * @param targetTypeManagement Target type management - */ JpaTargetCreate(final TargetTypeManagement targetTypeManagement) { super(null); this.targetTypeManagement = targetTypeManagement; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java index 92a6460e4..f34a9410b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java @@ -15,6 +15,7 @@ import org.eclipse.hawkbit.repository.builder.GenericTargetFilterQueryUpdate; import org.eclipse.hawkbit.repository.builder.TargetFilterQueryBuilder; import org.eclipse.hawkbit.repository.builder.TargetFilterQueryCreate; import org.eclipse.hawkbit.repository.builder.TargetFilterQueryUpdate; +import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.TargetFilterQuery; /** @@ -22,9 +23,9 @@ import org.eclipse.hawkbit.repository.model.TargetFilterQuery; */ public class JpaTargetFilterQueryBuilder implements TargetFilterQueryBuilder { - private final DistributionSetManagement distributionSetManagement; + private final DistributionSetManagement distributionSetManagement; - public JpaTargetFilterQueryBuilder(final DistributionSetManagement distributionSetManagement) { + public JpaTargetFilterQueryBuilder(final DistributionSetManagement distributionSetManagement) { this.distributionSetManagement = distributionSetManagement; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java index 0cc8b3014..f312be675 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java @@ -15,6 +15,7 @@ import org.eclipse.hawkbit.repository.builder.TargetFilterQueryCreate; import org.eclipse.hawkbit.repository.exception.InvalidAutoAssignActionTypeException; import org.eclipse.hawkbit.repository.jpa.model.JpaTargetFilterQuery; import org.eclipse.hawkbit.repository.model.Action.ActionType; +import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.TargetFilterQuery; /** @@ -23,9 +24,9 @@ import org.eclipse.hawkbit.repository.model.TargetFilterQuery; public class JpaTargetFilterQueryCreate extends AbstractTargetFilterQueryUpdateCreate implements TargetFilterQueryCreate { - private final DistributionSetManagement distributionSetManagement; + private final DistributionSetManagement distributionSetManagement; - JpaTargetFilterQueryCreate(final DistributionSetManagement distributionSetManagement) { + JpaTargetFilterQueryCreate(final DistributionSetManagement distributionSetManagement) { this.distributionSetManagement = distributionSetManagement; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java index a92414326..7ae47de27 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java @@ -14,6 +14,7 @@ import org.eclipse.hawkbit.repository.builder.GenericTargetTypeUpdate; import org.eclipse.hawkbit.repository.builder.TargetTypeBuilder; import org.eclipse.hawkbit.repository.builder.TargetTypeCreate; import org.eclipse.hawkbit.repository.builder.TargetTypeUpdate; +import org.eclipse.hawkbit.repository.model.DistributionSetType; import org.eclipse.hawkbit.repository.model.TargetType; /** @@ -21,14 +22,9 @@ import org.eclipse.hawkbit.repository.model.TargetType; */ public class JpaTargetTypeBuilder implements TargetTypeBuilder { - private final DistributionSetTypeManagement distributionSetTypeManagement; + private final DistributionSetTypeManagement distributionSetTypeManagement; - /** - * Constructor - * - * @param distributionSetTypeManagement Distribution set type management - */ - public JpaTargetTypeBuilder(DistributionSetTypeManagement distributionSetTypeManagement) { + public JpaTargetTypeBuilder(DistributionSetTypeManagement distributionSetTypeManagement) { this.distributionSetTypeManagement = distributionSetTypeManagement; } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java index 50005c7cb..f654f3898 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java @@ -27,14 +27,9 @@ import org.springframework.util.CollectionUtils; */ public class JpaTargetTypeCreate extends AbstractTargetTypeUpdateCreate implements TargetTypeCreate { - private final DistributionSetTypeManagement distributionSetTypeManagement; + private final DistributionSetTypeManagement distributionSetTypeManagement; - /** - * Constructor - * - * @param distributionSetTypeManagement Distribution set type management - */ - JpaTargetTypeCreate(final DistributionSetTypeManagement distributionSetTypeManagement) { + JpaTargetTypeCreate(final DistributionSetTypeManagement distributionSetTypeManagement) { this.distributionSetTypeManagement = distributionSetTypeManagement; } @@ -49,13 +44,13 @@ public class JpaTargetTypeCreate extends AbstractTargetTypeUpdateCreate findDistributionSetTypeWithExceptionIfNotFound( + private Collection findDistributionSetTypeWithExceptionIfNotFound( final Collection distributionSetTypeId) { if (CollectionUtils.isEmpty(distributionSetTypeId)) { return Collections.emptyList(); } - final Collection type = distributionSetTypeManagement.get(distributionSetTypeId); + final Collection type = distributionSetTypeManagement.get(distributionSetTypeId); if (type.size() < distributionSetTypeId.size()) { throw new EntityNotFoundException(SoftwareModuleType.class, distributionSetTypeId); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java index 6267c0101..3933f7f8d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java @@ -780,9 +780,9 @@ public class JpaDeploymentManagement extends JpaActionManagement implements Depl final String initiatedBy, final Long dsId, final Collection targetsWithActionType, final String actionMessage, final AbstractDsAssignmentStrategy assignmentStrategy) { - final JpaDistributionSet distributionSet = (JpaDistributionSet) distributionSetManagement.getValidAndComplete(dsId); + final JpaDistributionSet distributionSet = distributionSetManagement.getValidAndComplete(dsId); - if (((JpaDistributionSetManagement) distributionSetManagement).isImplicitLockApplicable(distributionSet)) { + if (distributionSetManagement.isImplicitLockApplicable(distributionSet)) { // without new transaction DS changed event is not thrown DeploymentHelper.runInNewTransaction(txManager, "Implicit lock", status -> { distributionSetManagement.lock(distributionSet.getId()); @@ -951,7 +951,7 @@ public class JpaDeploymentManagement extends JpaActionManagement implements Depl return action; } - final JpaTarget target = (JpaTarget) action.getTarget(); + final JpaTarget target = action.getTarget(); if (target.getAssignedDistributionSet() != null && action.getDistributionSet().getId().equals(target.getAssignedDistributionSet().getId())) { // the target has already the distribution set assigned, we don't @@ -1003,8 +1003,8 @@ public class JpaDeploymentManagement extends JpaActionManagement implements Depl private void setAssignmentOnTargets(final List actions) { final List assignedDsTargets = actions.stream().map(savedAction -> { - final JpaTarget mergedTarget = (JpaTarget) entityManager.merge(savedAction.getTarget()); - mergedTarget.setAssignedDistributionSet((JpaDistributionSet) savedAction.getDistributionSet()); + final JpaTarget mergedTarget = entityManager.merge(savedAction.getTarget()); + mergedTarget.setAssignedDistributionSet(savedAction.getDistributionSet()); mergedTarget.setUpdateStatus(TargetUpdateStatus.PENDING); return mergedTarget; }).toList(); 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 4226a1e81..65703b701 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 @@ -132,6 +132,7 @@ public class JpaDistributionSetManagement this.repositoryProperties = repositoryProperties; } + @SuppressWarnings("java:S1066") // java:S1066 better readable without merging the if statements @Override public JpaDistributionSet update(final Update update) { final JpaDistributionSet distributionSet = getValid0(update.getId()); @@ -164,6 +165,7 @@ public class JpaDistributionSetManagement return toDelete.stream().filter(distributionSet -> assigned.contains(distributionSet.getId())).toList(); } + @Override protected void delete0(final Collection distributionSetIDs) { if (ObjectUtils.isEmpty(distributionSetIDs)) { return; // super checks but if empty we don't want to unassign from target filters diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java index 064f5a4df..42d9791a5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaRolloutManagement.java @@ -119,7 +119,7 @@ public class JpaRolloutManagement implements RolloutManagement { private final RolloutStatusCache rolloutStatusCache; private final ActionRepository actionRepository; private final TargetManagement targetManagement; - private final DistributionSetManagement distributionSetManagement; + private final DistributionSetManagement distributionSetManagement; private final TenantConfigurationManagement tenantConfigurationManagement; private final QuotaManagement quotaManagement; private final AfterTransactionCommitExecutor afterCommit; @@ -135,7 +135,7 @@ public class JpaRolloutManagement implements RolloutManagement { final RolloutStatusCache rolloutStatusCache, final ActionRepository actionRepository, final TargetManagement targetManagement, - final DistributionSetManagement distributionSetManagement, + final DistributionSetManagement distributionSetManagement, final TenantConfigurationManagement tenantConfigurationManagement, final QuotaManagement quotaManagement, final AfterTransactionCommitExecutor afterCommit, diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java index d1d23306b..9120ca6b7 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleManagement.java @@ -28,7 +28,6 @@ import org.eclipse.hawkbit.repository.QuotaManagement; import org.eclipse.hawkbit.repository.RepositoryConstants; import org.eclipse.hawkbit.repository.SoftwareModuleFields; import org.eclipse.hawkbit.repository.SoftwareModuleManagement; -import org.eclipse.hawkbit.repository.SoftwareModuleTypeManagement; import org.eclipse.hawkbit.repository.artifact.encryption.ArtifactEncryptionService; import org.eclipse.hawkbit.repository.builder.GenericSoftwareModuleMetadataUpdate; import org.eclipse.hawkbit.repository.builder.SoftwareModuleMetadataCreate; @@ -77,7 +76,6 @@ public class JpaSoftwareModuleManagement protected static final String SOFTWARE_MODULE_METADATA = "SoftwareModuleMetadata"; - private final SoftwareModuleTypeManagement softwareModuleTypeManagement; private final DistributionSetRepository distributionSetRepository; private final SoftwareModuleMetadataRepository softwareModuleMetadataRepository; private final SoftwareModuleTypeRepository softwareModuleTypeRepository; @@ -87,13 +85,11 @@ public class JpaSoftwareModuleManagement protected JpaSoftwareModuleManagement( final SoftwareModuleRepository softwareModuleRepository, final EntityManager entityManager, - final SoftwareModuleTypeManagement softwareModuleTypeManagement, final DistributionSetRepository distributionSetRepository, final SoftwareModuleMetadataRepository softwareModuleMetadataRepository, final SoftwareModuleTypeRepository softwareModuleTypeRepository, final ArtifactManagement artifactManagement, final QuotaManagement quotaManagement) { super(softwareModuleRepository, entityManager); - this.softwareModuleTypeManagement = softwareModuleTypeManagement; this.distributionSetRepository = distributionSetRepository; this.softwareModuleMetadataRepository = softwareModuleMetadataRepository; this.softwareModuleTypeRepository = softwareModuleTypeRepository; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleTypeManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleTypeManagement.java index a496260f8..f2b83199e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleTypeManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaSoftwareModuleTypeManagement.java @@ -20,7 +20,6 @@ import org.eclipse.hawkbit.repository.jpa.model.JpaSoftwareModuleType; import org.eclipse.hawkbit.repository.jpa.repository.DistributionSetTypeRepository; import org.eclipse.hawkbit.repository.jpa.repository.SoftwareModuleRepository; import org.eclipse.hawkbit.repository.jpa.repository.SoftwareModuleTypeRepository; -import org.eclipse.hawkbit.repository.jpa.utils.ExceptionMapper; import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty; import org.springframework.stereotype.Service; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetManagement.java index 0c2cc4e32..30a359a87 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetManagement.java @@ -36,7 +36,6 @@ import jakarta.persistence.metamodel.MapAttribute; import jakarta.validation.constraints.NotEmpty; import org.apache.commons.collections4.ListUtils; -import org.eclipse.hawkbit.repository.DistributionSetManagement; import org.eclipse.hawkbit.repository.FilterParams; import org.eclipse.hawkbit.repository.QuotaManagement; import org.eclipse.hawkbit.repository.TargetFields; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetTagManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetTagManagement.java index 855fdf914..721cb258a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetTagManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTargetTagManagement.java @@ -52,7 +52,7 @@ public class JpaTargetTagManagement implements TargetTagManagement { private final TargetTagRepository targetTagRepository; protected JpaTargetTagManagement(final TargetTagRepository targetTagRepository) { - this.targetTagRepository = targetTagRepository;; + this.targetTagRepository = targetTagRepository; } @Override diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTenantConfigurationManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTenantConfigurationManagement.java index 1c1a0971b..7c82bdde2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTenantConfigurationManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaTenantConfigurationManagement.java @@ -204,9 +204,7 @@ public class JpaTenantConfigurationManagement implements TenantConfigurationMana return; } - event.getEntity().ifPresent(tenantConfiguration -> { - evictCacheEntryByKeyIfPresent(tenantConfiguration.getKey()); - }); + event.getEntity().ifPresent(tenantConfiguration -> evictCacheEntryByKeyIfPresent(tenantConfiguration.getKey())); } @Override diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/RolloutSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/RolloutSpecification.java index fb1b89459..ed6f44677 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/RolloutSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/RolloutSpecification.java @@ -13,7 +13,6 @@ import jakarta.persistence.criteria.Predicate; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.eclipse.hawkbit.repository.jpa.model.AbstractJpaNamedEntity_; import org.eclipse.hawkbit.repository.jpa.model.JpaRollout; import org.eclipse.hawkbit.repository.jpa.model.JpaRollout_; import org.eclipse.hawkbit.repository.model.Rollout; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java index fe3f0da2a..2a75466e6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java @@ -57,7 +57,7 @@ public final class DeploymentHelper { action.setActive(false); action.setStatus(Status.CANCELED); - final JpaTarget target = (JpaTarget) action.getTarget(); + final JpaTarget target = action.getTarget(); final List nextActiveActions = actionRepository .findAll(ActionSpecifications.byTargetIdAndIsActive(target.getId()), Sort.by(Sort.Order.asc(AbstractJpaBaseEntity_.ID))) .stream() diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ControllerManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ControllerManagementTest.java index caa02be83..b3c16cc8a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ControllerManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ControllerManagementTest.java @@ -102,7 +102,7 @@ class ControllerManagementTest extends AbstractJpaIntegrationTest { @ExpectEvents({ @Expect(type = TargetCreatedEvent.class, count = 1), @Expect(type = TargetUpdatedEvent.class, count = 2) }) - void updateTargetAttributesFailsIfTooManyEntries() throws Exception { + void updateTargetAttributesFailsIfTooManyEntries() { final String controllerId = "test123"; final int allowedAttributes = quotaManagement.getMaxAttributeEntriesPerTarget(); testdataFactory.createTarget(controllerId); @@ -178,7 +178,7 @@ class ControllerManagementTest extends AbstractJpaIntegrationTest { @Expect(type = ActionCreatedEvent.class, count = 1), @Expect(type = TargetUpdatedEvent.class, count = 1), @Expect(type = TargetAssignDistributionSetEvent.class, count = 1) }) - void controllerProvidesIntermediateFeedbackFailsIfQuotaHit() throws Exception { + void controllerProvidesIntermediateFeedbackFailsIfQuotaHit() { final int allowStatusEntries = 10; final Long actionId = createTargetAndAssignDs(); @@ -1154,7 +1154,7 @@ class ControllerManagementTest extends AbstractJpaIntegrationTest { @ExpectEvents({ @Expect(type = TargetCreatedEvent.class, count = 1), @Expect(type = TargetUpdatedEvent.class, count = 3) }) - void updateTargetAttributes() throws Exception { + void updateTargetAttributes() { final String controllerId = "test123"; final Target target = testdataFactory.createTarget(controllerId); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleTypeManagementTest.java index bfe8d971e..d1c2303ff 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleTypeManagementTest.java @@ -17,6 +17,7 @@ import java.util.List; import jakarta.validation.ConstraintViolationException; +import org.assertj.core.api.Assertions; import org.eclipse.hawkbit.repository.SoftwareModuleManagement; import org.eclipse.hawkbit.repository.SoftwareModuleTypeManagement; import org.eclipse.hawkbit.repository.event.remote.entity.SoftwareModuleCreatedEvent; @@ -27,7 +28,6 @@ import org.eclipse.hawkbit.repository.model.SoftwareModuleType; import org.eclipse.hawkbit.repository.test.matcher.Expect; import org.eclipse.hawkbit.repository.test.matcher.ExpectEvents; import org.junit.jupiter.api.Test; -import org.springframework.data.domain.Slice; /** * Feature: Component Tests - Repository
@@ -40,7 +40,7 @@ class SoftwareModuleTypeManagementTest extends AbstractJpaIntegrationTest { * of Optional not present. */ @Test - @ExpectEvents({ @Expect(type = SoftwareModuleCreatedEvent.class, count = 0) }) + @ExpectEvents({ @Expect(type = SoftwareModuleCreatedEvent.class) }) void nonExistingEntityAccessReturnsNotPresent() { assertThat(softwareModuleTypeManagement.get(NOT_EXIST_IDL)).isNotPresent(); @@ -53,7 +53,7 @@ class SoftwareModuleTypeManagementTest extends AbstractJpaIntegrationTest { * by means of throwing EntityNotFoundException. */ @Test - @ExpectEvents({ @Expect(type = SoftwareModuleCreatedEvent.class, count = 0) }) + @ExpectEvents({ @Expect(type = SoftwareModuleCreatedEvent.class) }) void entityQueriesReferringToNotExistingEntitiesThrowsException() { verifyThrownExceptionBy(() -> softwareModuleTypeManagement.delete(NOT_EXIST_IDL), "SoftwareModuleType"); @@ -114,35 +114,35 @@ class SoftwareModuleTypeManagementTest extends AbstractJpaIntegrationTest { */ @Test void deleteAssignedAndUnassignedSoftwareModuleTypes() { - assertThat((Slice) softwareModuleTypeManagement.findAll(PAGE)).hasSize(3).contains(osType, runtimeType, appType); + Assertions.assertThat(softwareModuleTypeManagement.findAll(PAGE)).hasSize(3).contains(osType, runtimeType, appType); SoftwareModuleType type = softwareModuleTypeManagement .create(SoftwareModuleTypeManagement.Create.builder().key("bundle").name("OSGi Bundle").build()); - assertThat((Slice) softwareModuleTypeManagement.findAll(PAGE)).hasSize(4).contains(osType, runtimeType, appType, type); + Assertions.assertThat(softwareModuleTypeManagement.findAll(PAGE)).hasSize(4).contains(osType, runtimeType, appType, type); // delete unassigned softwareModuleTypeManagement.delete(type.getId()); - assertThat((Slice) softwareModuleTypeManagement.findAll(PAGE)).hasSize(3).contains(osType, runtimeType, appType); - assertThat((List) softwareModuleTypeRepository.findAll()).hasSize(3).contains(osType, runtimeType, appType); + Assertions.assertThat(softwareModuleTypeManagement.findAll(PAGE)).hasSize(3).contains(osType, runtimeType, appType); + Assertions.assertThat(softwareModuleTypeRepository.findAll()).hasSize(3).contains(osType, runtimeType, appType); type = softwareModuleTypeManagement .create(SoftwareModuleTypeManagement.Create.builder().key("bundle2").name("OSGi Bundle2").build()); - assertThat((Slice) softwareModuleTypeManagement.findAll(PAGE)).hasSize(4).contains(osType, runtimeType, appType, type); + Assertions.assertThat(softwareModuleTypeManagement.findAll(PAGE)).hasSize(4).contains(osType, runtimeType, appType, type); softwareModuleManagement .create(SoftwareModuleManagement.Create.builder().type(type).name("Test SM").version("1.0").build()); // delete assigned softwareModuleTypeManagement.delete(type.getId()); - assertThat((Slice) softwareModuleTypeManagement.findAll(PAGE)).hasSize(3).contains(osType, runtimeType, appType); - assertThat((Slice) softwareModuleTypeManagement.findByRsql("name==*", PAGE)).hasSize(3).contains(osType, runtimeType, appType); + Assertions.assertThat(softwareModuleTypeManagement.findAll(PAGE)).hasSize(3).contains(osType, runtimeType, appType); + Assertions.assertThat(softwareModuleTypeManagement.findByRsql("name==*", PAGE)).hasSize(3).contains(osType, runtimeType, appType); assertThat(softwareModuleTypeManagement.count()).isEqualTo(3); assertThat(softwareModuleTypeRepository.findAll()).hasSize(4).contains((JpaSoftwareModuleType) osType, (JpaSoftwareModuleType) runtimeType, (JpaSoftwareModuleType) appType, - softwareModuleTypeRepository.findById(type.getId()).get()); + softwareModuleTypeRepository.findById(type.getId()).orElseThrow()); } /** @@ -156,8 +156,8 @@ class SoftwareModuleTypeManagementTest extends AbstractJpaIntegrationTest { softwareModuleTypeManagement .create(SoftwareModuleTypeManagement.Create.builder().key("thetype2").name("anothername").build()); - assertThat((((SoftwareModuleTypeManagement) softwareModuleTypeManagement)).findByName("thename")).as( - "Type with given name").contains(found); + Assertions.assertThat(((SoftwareModuleTypeManagement) softwareModuleTypeManagement).findByName("thename")) + .as("Type with given name").contains(found); } /** diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java index 340229c3e..eb5fcc7e1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SystemManagementTest.java @@ -129,8 +129,7 @@ class SystemManagementTest extends AbstractJpaIntegrationTest { assertThat(tenants).containsOnly(new TenantUsage("DEFAULT"), tenantUsage0, tenantUsage1); } - private byte[] createTestTenantsForSystemStatistics(final int tenants, final int artifactSize, final int targets, - final int updates) throws Exception { + private byte[] createTestTenantsForSystemStatistics(final int tenants, final int artifactSize, final int targets, final int updates) { final Random randomgen = new Random(); final byte[] random = new byte[artifactSize]; randomgen.nextBytes(random); diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java index 8e33265eb..a8adf0a04 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java @@ -25,32 +25,14 @@ import org.eclipse.hawkbit.repository.artifact.urlhandler.ArtifactUrlHandlerProp import org.eclipse.hawkbit.repository.artifact.urlhandler.PropertyBasedArtifactUrlHandler; import org.eclipse.hawkbit.cache.TenantAwareCacheManager; import org.eclipse.hawkbit.event.BusProtoStuffMessageConverter; -import org.eclipse.hawkbit.repository.ArtifactManagement; -import org.eclipse.hawkbit.repository.ControllerManagement; -import org.eclipse.hawkbit.repository.DeploymentManagement; -import org.eclipse.hawkbit.repository.DistributionSetInvalidationManagement; -import org.eclipse.hawkbit.repository.DistributionSetManagement; -import org.eclipse.hawkbit.repository.DistributionSetTagManagement; -import org.eclipse.hawkbit.repository.DistributionSetTypeManagement; -import org.eclipse.hawkbit.repository.EntityFactory; -import org.eclipse.hawkbit.repository.QuotaManagement; import org.eclipse.hawkbit.repository.RolloutApprovalStrategy; -import org.eclipse.hawkbit.repository.RolloutHandler; -import org.eclipse.hawkbit.repository.RolloutManagement; import org.eclipse.hawkbit.repository.RolloutStatusCache; -import org.eclipse.hawkbit.repository.SoftwareModuleManagement; -import org.eclipse.hawkbit.repository.SoftwareModuleTypeManagement; -import org.eclipse.hawkbit.repository.TargetFilterQueryManagement; -import org.eclipse.hawkbit.repository.TargetManagement; -import org.eclipse.hawkbit.repository.TargetTagManagement; -import org.eclipse.hawkbit.repository.TargetTypeManagement; import org.eclipse.hawkbit.repository.event.ApplicationEventFilter; import org.eclipse.hawkbit.repository.event.EventPublisherHolder; import org.eclipse.hawkbit.repository.rsql.VirtualPropertyReplacer; import org.eclipse.hawkbit.repository.rsql.VirtualPropertyResolver; import org.eclipse.hawkbit.repository.test.util.RolloutTestApprovalStrategy; import org.eclipse.hawkbit.repository.test.util.SystemManagementHolder; -import org.eclipse.hawkbit.repository.test.util.TestdataFactory; import org.eclipse.hawkbit.security.DdiSecurityProperties; import org.eclipse.hawkbit.security.HawkbitSecurityProperties; import org.eclipse.hawkbit.security.SecurityContextSerializer; diff --git a/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/Tenant.java b/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/Tenant.java index 9352e2229..beee07abc 100644 --- a/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/Tenant.java +++ b/hawkbit-sdk/hawkbit-sdk-commons/src/main/java/org/eclipse/hawkbit/sdk/Tenant.java @@ -9,7 +9,6 @@ */ package org.eclipse.hawkbit.sdk; -import java.security.cert.Certificate; import java.security.cert.X509Certificate; import lombok.Data; diff --git a/hawkbit-sdk/hawkbit-sdk-mgmt/src/main/java/org/eclipse/hawkbit/sdk/mgmt/AuthenticationSetupHelper.java b/hawkbit-sdk/hawkbit-sdk-mgmt/src/main/java/org/eclipse/hawkbit/sdk/mgmt/AuthenticationSetupHelper.java index 1c7d6ff61..f9b0ae257 100644 --- a/hawkbit-sdk/hawkbit-sdk-mgmt/src/main/java/org/eclipse/hawkbit/sdk/mgmt/AuthenticationSetupHelper.java +++ b/hawkbit-sdk/hawkbit-sdk-mgmt/src/main/java/org/eclipse/hawkbit/sdk/mgmt/AuthenticationSetupHelper.java @@ -14,7 +14,6 @@ import java.security.SecureRandom; import java.security.cert.CertificateException; import java.util.Base64; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Random; diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/audit/AuditContextProvider.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/audit/AuditContextProvider.java index f85a6c145..9637926a0 100644 --- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/audit/AuditContextProvider.java +++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/audit/AuditContextProvider.java @@ -15,8 +15,6 @@ import lombok.NoArgsConstructor; import org.eclipse.hawkbit.tenancy.TenantAware; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.AuditorAware; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; @NoArgsConstructor(access = lombok.AccessLevel.PRIVATE) @SuppressWarnings("java:S6548") // java:S6548 - singleton holder ensures static access to spring resources in some places diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java index 92abe852c..d706c8325 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java +++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java @@ -12,7 +12,6 @@ package org.eclipse.hawkbit.ui.simple; import com.vaadin.flow.component.page.AppShellConfigurator; import com.vaadin.flow.server.PWA; import com.vaadin.flow.theme.Theme; -import com.vaadin.flow.theme.lumo.Lumo; import feign.Contract; import feign.RequestInterceptor; import feign.codec.Decoder; @@ -57,7 +56,7 @@ import static java.util.Collections.emptyList; @Import(FeignClientsConfiguration.class) public class SimpleUIApp implements AppShellConfigurator { - private static final Function AUTHORIZATION = (oAuth2TokenManager) -> requestTemplate -> { + private static final Function AUTHORIZATION = oAuth2TokenManager -> requestTemplate -> { final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (oAuth2TokenManager != null && authentication instanceof OAuth2AuthenticationToken oAuth2AuthenticationToken) { String bearerToken = oAuth2TokenManager.getToken(oAuth2AuthenticationToken); @@ -109,7 +108,7 @@ public class SimpleUIApp implements AppShellConfigurator { @Bean OAuth2UserService oidcUserService(final HawkbitMgmtClient hawkbitClient) { final OidcUserService delegate = new OidcUserService(); - return (userRequest) -> { + return userRequest -> { OidcUser oidcUser = delegate.loadUser(userRequest); final OAuth2AuthenticationToken tempToken = new OAuth2AuthenticationToken( diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/VaadinServiceInit.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/VaadinServiceInit.java index 55941eac6..601549ce9 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/VaadinServiceInit.java +++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/VaadinServiceInit.java @@ -22,8 +22,7 @@ public class VaadinServiceInit implements VaadinServiceInitListener { @Override public void serviceInit(ServiceInitEvent event) { // cache zoneId of client as soon as possible - event.getSource().addUIInitListener(uiEvent -> { - uiEvent.getUI().getPage().retrieveExtendedClientDetails(details -> {}); - }); + event.getSource().addUIInitListener(uiEvent -> + uiEvent.getUI().getPage().retrieveExtendedClientDetails(details -> {})); } } diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java index 62757d59b..69272df8b 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java +++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java @@ -97,6 +97,16 @@ public class TargetView extends TableView { public static final String FILTER = "Filter"; public static final String TAG = "Tag"; + public static final String GREEN = "green"; + public static final String RED = "red"; + public static final String ORANGE = "orange"; + public static final String GRAY = "gray"; + public static final String BROWN = "brown"; + public static final String TEAL = "teal"; + public static final String PURPLE = "purple"; + public static final String CORAL = "coral"; + public static final String BLACK = "black"; + public TargetView(final HawkbitMgmtClient hawkbitClient) { super( new RawFilter(hawkbitClient), new SimpleFilter(hawkbitClient), @@ -650,19 +660,17 @@ public class TargetView extends TableView { final Icon icon; switch (status.getType()) { - case FINISHED -> icon = Utils.iconColored(VaadinIcon.CHECK_CIRCLE, "Finished", "green"); - case ERROR -> icon = Utils.iconColored(VaadinIcon.CLOSE_CIRCLE, "Error", "red"); - case WARNING -> icon = Utils.iconColored(VaadinIcon.WARNING, "Warning", "orange"); - case RUNNING -> icon = Utils.iconColored(VaadinIcon.ADJUST, "Running", "green"); - case RETRIEVED -> icon = Utils.iconColored(VaadinIcon.CIRCLE_THIN, "Retrieved", "green"); - case CANCELED -> icon = Utils.iconColored(VaadinIcon.CLOSE_CIRCLE_O, "Canceled", "gray"); - case CANCELING -> icon = Utils.iconColored(VaadinIcon.CLOSE_CIRCLE, "Cancelling", "brown"); - case DOWNLOAD -> icon = Utils.iconColored(VaadinIcon.CLOUD_DOWNLOAD_O, "Download", "teal"); - case DOWNLOADED -> icon = Utils.iconColored(VaadinIcon.CLOUD_DOWNLOAD, "Downloaded", "purple"); - case WAIT_FOR_CONFIRMATION -> - icon = Utils.iconColored(VaadinIcon.QUESTION_CIRCLE, "Wait for confirmation", "coral"); - default -> icon = Utils.iconColored(VaadinIcon.CIRCLE_THIN, status.getType().getName().toLowerCase(), - "black"); + case FINISHED -> icon = Utils.iconColored(VaadinIcon.CHECK_CIRCLE, "Finished", GREEN); + case ERROR -> icon = Utils.iconColored(VaadinIcon.CLOSE_CIRCLE, "Error", RED); + case WARNING -> icon = Utils.iconColored(VaadinIcon.WARNING, "Warning", ORANGE); + case RUNNING -> icon = Utils.iconColored(VaadinIcon.ADJUST, "Running", GREEN); + case RETRIEVED -> icon = Utils.iconColored(VaadinIcon.CIRCLE_THIN, "Retrieved", GREEN); + case CANCELED -> icon = Utils.iconColored(VaadinIcon.CLOSE_CIRCLE_O, "Canceled", GRAY); + case CANCELING -> icon = Utils.iconColored(VaadinIcon.CLOSE_CIRCLE, "Cancelling", BROWN); + case DOWNLOAD -> icon = Utils.iconColored(VaadinIcon.CLOUD_DOWNLOAD_O, "Download", TEAL); + case DOWNLOADED -> icon = Utils.iconColored(VaadinIcon.CLOUD_DOWNLOAD, "Downloaded", PURPLE); + case WAIT_FOR_CONFIRMATION -> icon = Utils.iconColored(VaadinIcon.QUESTION_CIRCLE, "Wait for confirmation", CORAL); + default -> icon = Utils.iconColored(VaadinIcon.CIRCLE_THIN, status.getType().getName().toLowerCase(), BLACK); } icon.addClassNames(LumoUtility.IconSize.SMALL); @@ -910,9 +918,9 @@ public class TargetView extends TableView { }; final String color = switch (targetUpdateStatus) { - case "error" -> "red"; - case "in_sync" -> "green"; - case "pending" -> "orange"; + case "error" -> RED; + case "in_sync" -> GREEN; + case "pending" -> ORANGE; case "registered" -> "lightblue"; default -> "blue"; }; diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java index d492365f4..21b1ac58a 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java +++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java @@ -87,7 +87,7 @@ public class TableView extends Div implements Constants, BeforeEnterObser } filter = new Filter( - (rsqlFilter) -> { + rsqlFilter -> { closeDetailsPanel(); if (rsqlFilter != null) { var queryParameters = UI.getCurrent().getActiveViewLocation() diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java index ec06a6b1e..6617ace07 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java +++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java @@ -261,9 +261,7 @@ public class Utils { private static ZoneId getZoneId() { CompletableFuture zoneId = new CompletableFuture<>(); - UI.getCurrent().getPage().retrieveExtendedClientDetails(details -> { - zoneId.complete(ZoneId.of(details.getTimeZoneId())); - }); + UI.getCurrent().getPage().retrieveExtendedClientDetails(details -> zoneId.complete(ZoneId.of(details.getTimeZoneId()))); try { return zoneId.get(1, TimeUnit.SECONDS); } catch (final InterruptedException e) {