diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java
index ca07e6cd5..d1857dbb3 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java
@@ -28,5 +28,4 @@ public interface AutoAssignExecutor {
      * @param controllerId of the device to check
      */
     void checkSingleTarget(String controllerId);
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java
index 6f4b5ca6b..f8634cfad 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java
@@ -22,5 +22,4 @@ public interface ActionStatusBuilder {
      * @return create builder
      */
     ActionStatusCreate create(long actionId);
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java
index 5d8b7ca5c..978ae4baf 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java
@@ -30,5 +30,4 @@ public interface SoftwareModuleMetadataBuilder {
      * @return builder instance
      */
     SoftwareModuleMetadataCreate create(long softwareModuleId);
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java
index 6e301fc4a..817971f02 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java
@@ -46,5 +46,4 @@ public interface SoftwareModuleMetadataCreate {
      *         builder
      */
     SoftwareModuleMetadata build();
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java
index 28a87b2e7..dfd87cc14 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java
@@ -32,5 +32,4 @@ public interface SoftwareModuleMetadataUpdate {
      * @return updated builder instance
      */
     SoftwareModuleMetadataUpdate targetVisible(Boolean visible);
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java
index bc4c770e5..e14775f72 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java
@@ -26,4 +26,4 @@ public interface SoftwareModuleTypeBuilder {
      * @return builder instance
      */
     SoftwareModuleTypeCreate create();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java
index fadafa89e..76b5e59c1 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java
@@ -59,4 +59,4 @@ public interface SoftwareModuleTypeCreate {
      *         builder
      */
     SoftwareModuleType build();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java
index 39f8a0717..f8c14468d 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java
@@ -26,5 +26,4 @@ public interface TagBuilder {
      * @return builder instance
      */
     TagCreate create();
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java
index b96fd099e..cd4f771e2 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java
@@ -38,5 +38,4 @@ public interface TagUpdate {
      * @return updated builder instance
      */
     TagUpdate colour(@Size(max = Tag.COLOUR_MAX_SIZE) String colour);
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java
index c3853fd22..b7fff903c 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java
@@ -28,4 +28,4 @@ public interface TargetBuilder {
      * @return builder instance
      */
     TargetCreate create();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java
index 1556247c1..899562ccd 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java
@@ -81,5 +81,4 @@ public interface TargetCreate {
      * @return peek on current state of {@link Target} in the builder
      */
     Target build();
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java
index fc106425f..1d153a163 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java
@@ -36,4 +36,4 @@ public interface TargetFilterQueryBuilder {
      * @return builder instance
      */
     TargetFilterQueryCreate create();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java
index 6b05a4e3b..6e90da74d 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java
@@ -92,4 +92,4 @@ public interface TargetFilterQueryCreate {
      * @return peek on current state of {@link TargetFilterQuery} in the builder
      */
     TargetFilterQuery build();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java
index 0ec9baa21..8f248072c 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java
@@ -31,4 +31,4 @@ public interface TargetFilterQueryUpdate {
      * @return updated builder instance
      */
     TargetFilterQueryUpdate query(@Size(min = 1, max = TargetFilterQuery.QUERY_MAX_SIZE) String query);
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java
index 6400b0134..9c4bf5651 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java
@@ -26,4 +26,4 @@ public interface TargetTypeBuilder {
      * @return builder instance
      */
     TargetTypeCreate create();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java
index 14e4af932..a27cd60df 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java
@@ -80,4 +80,4 @@ public interface TargetTypeCreate {
      *         builder
      */
     TargetType build();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java
index 0334f4d9b..9e4f47d2f 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java
@@ -38,4 +38,4 @@ public interface TargetTypeUpdate {
      * @return updated builder instance
      */
     TargetTypeUpdate name(@Size(max = NamedEntity.NAME_MAX_SIZE) String name);
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java
index 20e451172..df1ed627f 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java
@@ -70,4 +70,4 @@ public interface TargetUpdate {
      * @return updated builder instance
      */
     TargetUpdate requestAttributes(Boolean requestAttributes);
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java
index dce764cf7..53fdbc3a5 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java
@@ -23,4 +23,4 @@ public interface ApplicationEventFilter {
      * @return true if event should be filtered
      */
     boolean filter(final ApplicationEvent event);
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/CustomEvents.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/CustomEvents.java
deleted file mode 100644
index 376961bb4..000000000
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/CustomEvents.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2015 Bosch Software Innovations GmbH and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.hawkbit.repository.event;
-
-/**
- * Events to be published to refresh data on UI.
- */
-public enum CustomEvents {
-
-    TARGETS_CREATED_EVENT,
-    DISTRIBUTION_CREATED_EVENT
-}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java
index 2d81643d2..c32f86996 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java
@@ -20,4 +20,4 @@ public interface TenantAwareEvent {
      * @return the tenant of the event.
      */
     String getTenant();
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java
index 4c06e5683..0d90d985d 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java
@@ -14,8 +14,7 @@ import java.util.Objects;
 import org.eclipse.hawkbit.repository.model.RolloutGroup;
 
 /**
- * Event which is published in case a {@linkplain RolloutGroup} is created or
- * updated
+ * Event which is published in case a {@linkplain RolloutGroup} is created or updated
  */
 public abstract class AbstractRolloutGroupEvent extends RemoteEntityEvent<RolloutGroup> {
 
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java
index 3e3687c0f..24a432f64 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java
@@ -41,5 +41,4 @@ public interface ActionStatus extends TenantAwareBaseEntity {
     Status getStatus();
 
     Optional<Integer> getCode();
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java
index 8f819b9a2..0be5ca9f8 100644
--- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java
+++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java
@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import lombok.Getter;
 import org.eclipse.hawkbit.repository.ValidString;
 import org.eclipse.hawkbit.repository.model.Action.Status;
 import org.springframework.util.StringUtils;
@@ -34,12 +35,9 @@ public abstract class AbstractActionStatusCreate<T> {
 
     protected List<@ValidString String> messages;
 
+    @Getter
     protected Long actionId;
 
-    public Long getActionId() {
-        return actionId;
-    }
-
     public T status(final Status status) {
         this.status = status;
 
@@ -59,10 +57,11 @@ public abstract class AbstractActionStatusCreate<T> {
     }
 
     public T messages(final Collection<String> messages) {
+        final List<String> newMessages = messages.stream().map(String::strip).toList();
         if (this.messages == null) {
-            this.messages = messages.stream().map(StringUtils::trimWhitespace).collect(Collectors.toList());
+            this.messages = newMessages;
         } else {
-            this.messages.addAll(messages.stream().map(StringUtils::trimWhitespace).collect(Collectors.toList()));
+            this.messages.addAll(newMessages);
         }
 
         return (T) this;
@@ -72,7 +71,7 @@ public abstract class AbstractActionStatusCreate<T> {
         if (this.messages == null) {
             this.messages = new ArrayList<>();
         }
-        this.messages.add(StringUtils.trimWhitespace(message));
+        this.messages.add(message.strip());
 
         return (T) this;
     }
@@ -80,5 +79,4 @@ public abstract class AbstractActionStatusCreate<T> {
     public Optional<Long> getOccurredAt() {
         return Optional.ofNullable(occurredAt);
     }
-
-}
+}
\ No newline at end of file
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java
index 0b5b930cc..2cf8cdb78 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java
@@ -16,8 +16,7 @@ import org.eclipse.hawkbit.repository.jpa.model.JpaActionStatus;
 /**
  * Create/build implementation.
  */
-public class JpaActionStatusCreate extends AbstractActionStatusCreate<ActionStatusCreate>
-        implements ActionStatusCreate {
+public class JpaActionStatusCreate extends AbstractActionStatusCreate<ActionStatusCreate> implements ActionStatusCreate {
 
     JpaActionStatusCreate(final Long actionId) {
         super.actionId = actionId;
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java
index 07b879a8b..2018ba35c 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java
@@ -9,6 +9,7 @@
  */
 package org.eclipse.hawkbit.repository.jpa.model;
 
+import java.io.Serial;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -30,6 +31,10 @@ import jakarta.persistence.NamedEntityGraph;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
 
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.Action.Status;
 import org.eclipse.hawkbit.repository.model.ActionStatus;
@@ -37,20 +42,23 @@ import org.eclipse.hawkbit.repository.model.ActionStatus;
 /**
  * Entity to store the status for a specific action.
  */
+@NoArgsConstructor(access = AccessLevel.PUBLIC) // JPA default constructor
 @Table(name = "sp_action_status", indexes = {
         @Index(name = "sp_idx_action_status_02", columnList = "tenant,action,status"),
-        @Index(name = "sp_idx_action_status_prim", columnList = "tenant,id") })
+        @Index(name = "sp_idx_action_status_prim", columnList = "tenant,id")
+})
 @NamedEntityGraph(name = "ActionStatus.withMessages", attributeNodes = { @NamedAttributeNode("messages") })
 @Entity
-// exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for
-// sub entities
+// exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for sub entities
 @SuppressWarnings("squid:S2160")
 public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements ActionStatus {
 
-    private static final int MESSAGE_ENTRY_LENGTH = 512;
-
+    @Serial
     private static final long serialVersionUID = 1L;
 
+    private static final int MESSAGE_ENTRY_LENGTH = 512;
+
+    @Setter @Getter
     @Column(name = "target_occurred_at", nullable = false, updatable = false)
     private long occurredAt;
 
@@ -61,11 +69,13 @@ public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements
     @NotNull
     private JpaAction action;
 
+    @Setter @Getter
     @Column(name = "status", nullable = false, updatable = false)
     @Convert(converter = JpaAction.StatusConverter.class)
     @NotNull
     private Status status;
 
+    // TODO - messages is not used yet. Check and verify if to remove or expose via REST API
     // no cascade option on an ElementCollection, the target objects are always persisted, merged, removed with their parent.
     @ElementCollection(fetch = FetchType.LAZY, targetClass = String.class)
     @CollectionTable(
@@ -78,6 +88,7 @@ public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements
     @Column(name = "detail_message", length = MESSAGE_ENTRY_LENGTH, nullable = false, insertable = false, updatable = false)
     private List<String> messages;
 
+    @Setter
     @Column(name = "code", nullable = true, updatable = false)
     private Integer code;
 
@@ -120,22 +131,6 @@ public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements
         this.occurredAt = occurredAt;
     }
 
-    /**
-     * JPA default constructor.
-     */
-    public JpaActionStatus() {
-        // JPA default constructor.
-    }
-
-    @Override
-    public long getOccurredAt() {
-        return occurredAt;
-    }
-
-    public void setOccurredAt(final long occurredAt) {
-        this.occurredAt = occurredAt;
-    }
-
     @Override
     public Action getAction() {
         return action;
@@ -145,23 +140,10 @@ public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements
         this.action = (JpaAction) action;
     }
 
-    @Override
-    public Status getStatus() {
-        return status;
-    }
-
-    public void setStatus(final Status status) {
-        this.status = status;
-    }
-
     public Optional<Integer> getCode() {
         return Optional.ofNullable(code);
     }
 
-    public void setCode(final Integer code) {
-        this.code = code;
-    }
-
     public final void addMessage(final String message) {
         if (message != null) {
             if (messages == null) {
@@ -191,4 +173,4 @@ public class JpaActionStatus extends AbstractJpaTenantAwareBaseEntity implements
 
         return Collections.unmodifiableList(messages);
     }
-}
+}
\ No newline at end of file