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

Lombok Usage Improvements (#2192)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2025-01-10 11:58:35 +02:00
committed by GitHub
parent 4ba6b63615
commit e1f43c8705
72 changed files with 137 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiPolling.java
View File

@@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -23,7 +22,7 @@ import lombok.ToString;
/**
* Polling interval for the SP target.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC)// needed for json create
@NoArgsConstructor // needed for json create
@Getter
@EqualsAndHashCode
@ToString

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/CancelTargetAssignmentEvent.java
View File

@@ -12,14 +12,13 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import java.util.List;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.Action;
/**
* Event that gets sent when the assignment of a distribution set to a target gets canceled.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class CancelTargetAssignmentEvent extends AbstractAssignmentEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSet;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event for deletion of {@link DistributionSet}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSetTag;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the the remote event of delete a {@link DistributionSetTag}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetTagDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSetType;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link DistributionSetType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetTypeDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DownloadProgressEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.ActionStatus;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.ActionStatus;
* TenantAwareEvent that contains an updated download progress for a given
* ActionStatus that was written for a download request.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DownloadProgressEvent extends RemoteTenantAwareEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionAssignEvent.java
View File

@@ -12,7 +12,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import java.util.List;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.Action;
@@ -23,7 +22,7 @@ import org.eclipse.hawkbit.repository.model.Action;
* actionIds containing the identifiers of the affected actions
* as payload. This event is only published in case of an assignment.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor
public class MultiActionAssignEvent extends MultiActionEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionCancelEvent.java
View File

@@ -12,7 +12,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import java.util.List;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.Action;
@@ -23,7 +22,7 @@ import org.eclipse.hawkbit.repository.model.Action;
* actionIds containing the identifiers of the affected actions
* as payload. This event is only published in case of an cancellation.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class MultiActionCancelEvent extends MultiActionEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.Rollout;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link Rollout}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class RolloutDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.RolloutGroup;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link RolloutGroup}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class RolloutGroupDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutStoppedEvent.java
View File

@@ -12,7 +12,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import java.util.Collection;
import lombok.AccessLevel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -23,7 +22,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSet;
* Event that is published when a rollout is stopped due to invalidation of a
* {@link DistributionSet}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.SoftwareModule;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link SoftwareModule}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class SoftwareModuleDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link SoftwareModuleType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class SoftwareModuleTypeDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -22,7 +21,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of triggering attribute updates of a {@link Target}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
@Getter
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -23,7 +22,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link Target}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
@Getter
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link TargetFilterQuery}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetFilterQueryDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetPollEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -21,7 +20,7 @@ import org.eclipse.hawkbit.repository.model.Target;
/**
* Event is sent in case a target polls either through DDI or DMF.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
@Getter
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.TargetTag;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of delete a {@link TargetTag}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetTagDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityDeletedEvent;
import org.eclipse.hawkbit.repository.model.TargetType;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity;
/**
* Defines the remote event of deleting a {@link TargetType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetTypeDeletedEvent extends RemoteIdEvent implements EntityDeletedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.Action;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.Action;
/**
* Defines the remote event of creating a new {@link Action}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class ActionCreatedEvent extends AbstractActionEvent implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.Action;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.Action;
/**
* Defines the remote event of updated a {@link Action}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class ActionUpdatedEvent extends AbstractActionEvent implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSet;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSet;
/**
* Defines the remote of creating a new {@link DistributionSet}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetCreatedEvent extends RemoteEntityEvent<DistributionSet> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSetTag;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSetTag;
* Defines the {@link RemoteEntityEvent} for creation of a new
* {@link DistributionSetTag}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetTagCreatedEvent extends RemoteEntityEvent<DistributionSetTag> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSetTag;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSetTag;
/**
* Defines the remote event for update a {@link DistributionSetTag}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetTagUpdatedEvent extends RemoteEntityEvent<DistributionSetTag> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSetType;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSetType;
/**
* Defines the remote event of creating a new {@link DistributionSetType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetTypeCreatedEvent extends RemoteEntityEvent<DistributionSetType> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSetType;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
/**
* Defines the remote event for updating a {@link SoftwareModuleType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetTypeUpdatedEvent extends RemoteEntityEvent<DistributionSetType> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.DistributionSet;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSet;
/**
* Defines the remote event for updating a {@link DistributionSet}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class DistributionSetUpdatedEvent extends RemoteEntityEvent<DistributionSet> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.Rollout;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.Rollout;
/**
* Defines the remote event of creating a new {@link Rollout}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class RolloutCreatedEvent extends RemoteEntityEvent<Rollout> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.RolloutGroup;
@@ -20,7 +19,7 @@ import org.eclipse.hawkbit.repository.model.RolloutGroup;
* TenantAwareEvent definition which is being published in case a rollout group
* has been created for a specific rollout.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class RolloutGroupCreatedEvent extends AbstractRolloutGroupEvent implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.RolloutGroup;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.RolloutGroup;
/**
* Defines the remote event of updated a {@link RolloutGroup}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class RolloutGroupUpdatedEvent extends AbstractRolloutGroupEvent implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.Rollout;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.Rollout;
/**
* Defines the remote event of updated a {@link Rollout}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class RolloutUpdatedEvent extends RemoteEntityEvent<Rollout> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.SoftwareModule;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModule;
/**
* Defines the remote event of creating a new {@link SoftwareModule}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class SoftwareModuleCreatedEvent extends RemoteEntityEvent<SoftwareModule> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
/**
* Defines the remote event of creating a new {@link SoftwareModuleType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class SoftwareModuleTypeCreatedEvent extends RemoteEntityEvent<SoftwareModuleType> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
/**
* Defines the remote event for updating a {@link SoftwareModuleType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class SoftwareModuleTypeUpdatedEvent extends RemoteEntityEvent<SoftwareModuleType> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.SoftwareModule;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModule;
/**
* Defines the remote event for updating a {@link SoftwareModule}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class SoftwareModuleUpdatedEvent extends RemoteEntityEvent<SoftwareModule> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.Target;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.Target;
/**
* Defines the remote event of creating a new {@link Target}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetCreatedEvent extends RemoteEntityEvent<Target> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
/**
* Defines the remote event of creating a new {@link TargetFilterQuery}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetFilterQueryCreatedEvent extends RemoteEntityEvent<TargetFilterQuery> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TargetFilterQuery;
/**
* Defines the remote event for updating a {@link TargetFilterQuery}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetFilterQueryUpdatedEvent extends RemoteEntityEvent<TargetFilterQuery> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.TargetTag;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TargetTag;
/**
* Defines the remote event for the creation of a new {@link TargetTag}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetTagCreatedEvent extends RemoteEntityEvent<TargetTag> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.TargetTag;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TargetTag;
/**
* Defines the remote event for updating a {@link TargetTag}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetTagUpdatedEvent extends RemoteEntityEvent<TargetTag> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.TargetType;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TargetType;
/**
* Defines the remote event of creating a new {@link TargetType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetTypeCreatedEvent extends RemoteEntityEvent<TargetType> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.TargetType;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TargetType;
/**
* Defines the remote event for updating a {@link TargetType}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetTypeUpdatedEvent extends RemoteEntityEvent<TargetType> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.Target;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.Target;
/**
* Defines the remote event for updating a {@link Target}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TargetUpdatedEvent extends RemoteEntityEvent<Target> implements EntityUpdatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationCreatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityCreatedEvent;
import org.eclipse.hawkbit.repository.model.TenantConfiguration;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TenantConfiguration;
/**
* Defines the remote event of creating a new {@link TenantConfiguration}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TenantConfigurationCreatedEvent extends RemoteEntityEvent<TenantConfiguration> implements EntityCreatedEvent {
@Serial

3
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationUpdatedEvent.java
View File

@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.event.remote.entity;
import java.io.Serial;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.entity.EntityUpdatedEvent;
import org.eclipse.hawkbit.repository.model.TenantConfiguration;
@@ -19,7 +18,7 @@ import org.eclipse.hawkbit.repository.model.TenantConfiguration;
/**
* Defines the remote event of updating a {@link TenantConfiguration}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // for serialization libs like jackson
@NoArgsConstructor // for serialization libs like jackson
public class TenantConfigurationUpdatedEvent extends RemoteEntityEvent<TenantConfiguration> implements EntityUpdatedEvent {
@Serial

4
hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/EventType.java
View File

@@ -12,9 +12,7 @@ package org.eclipse.hawkbit.event;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -76,7 +74,7 @@ import org.eclipse.hawkbit.repository.event.remote.entity.TenantConfigurationUpd
* encoded value in the byte-payload.
*/
// for marshalling and unmarshalling.
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@NoArgsConstructor
@Getter
@EqualsAndHashCode
@ToString

1
hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/TimestampCalculator.java
View File

@@ -10,7 +10,6 @@
package org.eclipse.hawkbit.repository;
import java.time.Duration;
import java.time.Instant;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

21
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetCreate.java
View File

@@ -24,6 +24,7 @@ import org.eclipse.hawkbit.repository.jpa.model.JpaDistributionSet;
import org.eclipse.hawkbit.repository.model.DistributionSetType;
import org.eclipse.hawkbit.repository.model.SoftwareModule;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
/**
@@ -33,19 +34,20 @@ public class JpaDistributionSetCreate extends AbstractDistributionSetUpdateCreat
private final DistributionSetTypeManagement distributionSetTypeManagement;
private final SoftwareModuleManagement softwareModuleManagement;
@Getter
@ValidString
private String type;
JpaDistributionSetCreate(final DistributionSetTypeManagement distributionSetTypeManagement,
final SoftwareModuleManagement softwareManagement) {
JpaDistributionSetCreate(
final DistributionSetTypeManagement distributionSetTypeManagement, final SoftwareModuleManagement softwareManagement) {
this.distributionSetTypeManagement = distributionSetTypeManagement;
this.softwareModuleManagement = softwareManagement;
}
@Override
public DistributionSetCreate type(final String type) {
this.type = StringUtils.trimWhitespace(type);
this.type = ObjectUtils.isEmpty(type) ? type : type.strip();
return this;
}
@@ -63,17 +65,16 @@ public class JpaDistributionSetCreate extends AbstractDistributionSetUpdateCreat
.orElseThrow(() -> new EntityNotFoundException(DistributionSetType.class, distributionSetTypekey));
}
private Collection<SoftwareModule> findSoftwareModuleWithExceptionIfNotFound(
final Collection<Long> softwareModuleId) {
if (CollectionUtils.isEmpty(softwareModuleId)) {
private Collection<SoftwareModule> findSoftwareModuleWithExceptionIfNotFound(final Collection<Long> softwareModuleIds) {
if (CollectionUtils.isEmpty(softwareModuleIds)) {
return Collections.emptyList();
}
final Collection<SoftwareModule> module = softwareModuleManagement.get(softwareModuleId);
if (module.size() < softwareModuleId.size()) {
throw new EntityNotFoundException(SoftwareModule.class, softwareModuleId);
final Collection<SoftwareModule> modules = softwareModuleManagement.get(softwareModuleIds);
if (modules.size() < softwareModuleIds.size()) {
throw new EntityNotFoundException(SoftwareModule.class, softwareModuleIds);
}
return module;
return modules;
}
}

61
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElement.java
View File

@@ -23,6 +23,9 @@ import jakarta.persistence.ManyToOne;
import jakarta.persistence.MapsId;
import jakarta.persistence.Table;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.eclipse.hawkbit.repository.model.DistributionSet;
import org.eclipse.hawkbit.repository.model.DistributionSetType;
import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
@@ -31,6 +34,8 @@ import org.eclipse.hawkbit.repository.model.SoftwareModuleType;
* Relation element between a {@link DistributionSetType} and its
* {@link SoftwareModuleType} elements.
*/
@NoArgsConstructor // Default constructor for JPA
@Getter
@Entity
@Table(name = "sp_ds_type_element")
public class DistributionSetTypeElement implements Serializable {
@@ -41,9 +46,6 @@ public class DistributionSetTypeElement implements Serializable {
@EmbeddedId
private DistributionSetTypeElementCompositeKey key;
@Column(name = "mandatory")
private boolean mandatory;
@MapsId("dsType")
@ManyToOne(optional = false, fetch = FetchType.LAZY)
@JoinColumn(name = "distribution_set_type", nullable = false, updatable = false, foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_ds_type_element_element"))
@@ -54,52 +56,34 @@ public class DistributionSetTypeElement implements Serializable {
@JoinColumn(name = "software_module_type", nullable = false, updatable = false, foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_ds_type_element_smtype"))
private JpaSoftwareModuleType smType;
public DistributionSetTypeElement() {
// Default constructor for JPA
}
@Setter
@Column(name = "mandatory")
private boolean mandatory;
/**
* Standard constructor.
*
* @param dsType of the element
* @param smType of the element
* @param mandatory to <code>true</code> if the {@link SoftwareModuleType} if
* mandatory element in the {@link DistributionSet}.
* @param mandatory to <code>true</code> if the {@link SoftwareModuleType} if mandatory element in the {@link DistributionSet}.
*/
DistributionSetTypeElement(final JpaDistributionSetType dsType, final JpaSoftwareModuleType smType,
final boolean mandatory) {
DistributionSetTypeElement(final JpaDistributionSetType dsType, final JpaSoftwareModuleType smType, final boolean mandatory) {
key = new DistributionSetTypeElementCompositeKey(dsType, smType);
this.dsType = dsType;
this.smType = smType;
this.mandatory = mandatory;
}
public boolean isMandatory() {
return mandatory;
}
DistributionSetTypeElement setMandatory(final boolean mandatory) {
this.mandatory = mandatory;
return this;
}
public DistributionSetType getDsType() {
return dsType;
}
public SoftwareModuleType getSmType() {
return smType;
}
public DistributionSetTypeElementCompositeKey getKey() {
return key;
@Override
public String toString() {
return "DistributionSetTypeElement [mandatory=" + mandatory + ", dsType=" + dsType + ", smType=" + smType + "]";
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((key == null) ? 0 : key.hashCode());
result = prime * result + (key == null ? 0 : key.hashCode());
return result;
}
@@ -116,18 +100,9 @@ public class DistributionSetTypeElement implements Serializable {
}
final DistributionSetTypeElement other = (DistributionSetTypeElement) obj;
if (key == null) {
if (other.key != null) {
return false;
}
} else if (!key.equals(other.key)) {
return false;
return other.key == null;
} else {
return key.equals(other.key);
}
return true;
}
@Override
public String toString() {
return "DistributionSetTypeElement [mandatory=" + mandatory + ", dsType=" + dsType + ", smType=" + smType + "]";
}
}
}

44
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java
View File

@@ -12,23 +12,24 @@ package org.eclipse.hawkbit.repository.jpa.model;
import java.io.Serial;
import java.io.Serializable;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
/**
* The DistributionSet Metadata composite key which contains the meta data key
* and the ID of the DistributionSet itself.
* The DistributionSet Metadata composite key which contains the meta-data key and the ID of the DistributionSet itself.
*/
@NoArgsConstructor // Default constructor for JPA
@Setter
@Getter
public final class DsMetadataCompositeKey implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private String key;
private Long distributionSet;
public DsMetadataCompositeKey() {
// Default constructor for JPA.
}
/**
* @param distributionSet the distribution set for this meta data
* @param key the key of the meta data
@@ -38,22 +39,6 @@ public final class DsMetadataCompositeKey implements Serializable {
this.key = key;
}
public String getKey() {
return key;
}
public void setKey(final String key) {
this.key = key;
}
public Long getDistributionSet() {
return distributionSet;
}
public void setDistributionSet(final Long distributionSet) {
this.distributionSet = distributionSet;
}
@Override
public int hashCode() {
final int prime = 31;
@@ -65,7 +50,6 @@ public final class DsMetadataCompositeKey implements Serializable {
@Override
public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -84,13 +68,9 @@ public final class DsMetadataCompositeKey implements Serializable {
return false;
}
if (key == null) {
if (other.key != null) {
return false;
}
} else if (!key.equals(other.key)) {
return false;
return other.key == null;
} else {
return key.equals(other.key);
}
return true;
}
}
}

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java
View File

@@ -31,7 +31,6 @@ 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;
@@ -42,7 +41,7 @@ import org.eclipse.hawkbit.repository.model.ActionStatus;
/**
* Entity to store the status for a specific action.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // JPA default constructor
@NoArgsConstructor // 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")

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaArtifact.java
View File

@@ -25,7 +25,6 @@ import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -36,7 +35,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModule;
/**
* JPA implementation of {@link Artifact}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor needed for JPA entities.
@NoArgsConstructor // Default constructor needed for JPA entities.
@Setter
@Getter
@Table(name = "sp_artifact",

2
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java
View File

@@ -27,7 +27,7 @@ import org.eclipse.hawkbit.repository.model.NamedEntity;
import org.eclipse.hawkbit.repository.model.Target;
import org.springframework.util.StringUtils;
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor needed for JPA entities.
@NoArgsConstructor // Default constructor needed for JPA entities.
@Getter
@Entity
@Table(name = "sp_target_conf_status")

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetMetadata.java
View File

@@ -21,7 +21,6 @@ import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.DistributionSet;
@@ -30,7 +29,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSetMetadata;
/**
* Meta data for {@link DistributionSet}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor needed for JPA entities.
@NoArgsConstructor // Default constructor needed for JPA entities.
@Getter
@IdClass(DsMetadataCompositeKey.class)
@Entity

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java
View File

@@ -19,7 +19,6 @@ import jakarta.persistence.ManyToMany;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.event.remote.DistributionSetTagDeletedEvent;
import org.eclipse.hawkbit.repository.event.remote.entity.DistributionSetTagCreatedEvent;
@@ -31,7 +30,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* A {@link DistributionSetTag} is used to describe DistributionSet attributes and use them also for filtering the DistributionSet list.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor needed for JPA entities.
@NoArgsConstructor // Default constructor needed for JPA entities.
@Entity
@Table(name = "sp_distributionset_tag",
indexes = {

49
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java
View File

@@ -27,7 +27,6 @@ import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -45,7 +44,7 @@ import org.springframework.util.CollectionUtils;
/**
* A distribution set type defines which software module types can or have to be {@link DistributionSet}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor needed for JPA entities.
@NoArgsConstructor // Default constructor needed for JPA entities.
@Entity
@Table(name = "sp_distribution_set_type", indexes = {
@Index(name = "sp_idx_distribution_set_type_01", columnList = "tenant,deleted"),
@@ -59,10 +58,9 @@ public class JpaDistributionSetType extends AbstractJpaTypeEntity implements Dis
@Serial
private static final long serialVersionUID = 1L;
@OneToMany(mappedBy = "dsType",
targetEntity = DistributionSetTypeElement.class,
fetch = FetchType.EAGER, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE },
orphanRemoval = true)
@OneToMany(
mappedBy = "dsType", targetEntity = DistributionSetTypeElement.class,
fetch = FetchType.EAGER, cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REMOVE }, orphanRemoval = true)
private Set<DistributionSetTypeElement> elements = new HashSet<>();
@Setter
@@ -83,25 +81,33 @@ public class JpaDistributionSetType extends AbstractJpaTypeEntity implements Dis
@Override
public Set<SoftwareModuleType> getMandatoryModuleTypes() {
return elements.stream().filter(DistributionSetTypeElement::isMandatory)
.map(DistributionSetTypeElement::getSmType).collect(Collectors.toSet());
return elements.stream()
.filter(DistributionSetTypeElement::isMandatory)
.map(DistributionSetTypeElement::getSmType)
.collect(Collectors.toSet());
}
@Override
public Set<SoftwareModuleType> getOptionalModuleTypes() {
return elements.stream().filter(element -> !element.isMandatory())
.map(DistributionSetTypeElement::getSmType).collect(Collectors.toSet());
return elements.stream()
.filter(element -> !element.isMandatory())
.map(DistributionSetTypeElement::getSmType)
.collect(Collectors.toSet());
}
@Override
public boolean areModuleEntriesIdentical(final DistributionSetType dsType) {
if (!(dsType instanceof JpaDistributionSetType) || isOneModuleListEmpty(dsType)) {
if (dsType instanceof JpaDistributionSetType jpaDsType) {
if (isOneModuleListEmpty(jpaDsType)) {
return false;
} else if (areBothModuleListsEmpty(jpaDsType)) {
return true;
} else {
return new HashSet<>(jpaDsType.elements).equals(elements);
}
} else {
return false;
} else if (areBothModuleListsEmpty(dsType)) {
return true;
}
return new HashSet<>(((JpaDistributionSetType) dsType).elements).equals(elements);
}
@Override
@@ -123,7 +129,8 @@ public class JpaDistributionSetType extends AbstractJpaTypeEntity implements Dis
public JpaDistributionSetType removeModuleType(final Long smTypeId) {
// we search by id (standard equals compares also revision)
elements.stream().filter(element -> element.getSmType().getId().equals(smTypeId))
elements.stream()
.filter(element -> element.getSmType().getId().equals(smTypeId))
.findAny()
.ifPresent(elements::remove);
return this;
@@ -156,13 +163,13 @@ public class JpaDistributionSetType extends AbstractJpaTypeEntity implements Dis
getTenant(), getId(), getClass(), EventPublisherHolder.getInstance().getApplicationId()));
}
private boolean isOneModuleListEmpty(final DistributionSetType dsType) {
return (!CollectionUtils.isEmpty(((JpaDistributionSetType) dsType).elements) && CollectionUtils.isEmpty(elements)) ||
(CollectionUtils.isEmpty(((JpaDistributionSetType) dsType).elements) && !CollectionUtils.isEmpty(elements));
private boolean isOneModuleListEmpty(final JpaDistributionSetType dsType) {
return (!CollectionUtils.isEmpty(dsType.elements) && CollectionUtils.isEmpty(elements)) ||
(CollectionUtils.isEmpty(dsType.elements) && !CollectionUtils.isEmpty(elements));
}
private boolean areBothModuleListsEmpty(final DistributionSetType dsType) {
return CollectionUtils.isEmpty(((JpaDistributionSetType) dsType).elements) && CollectionUtils.isEmpty(elements);
private boolean areBothModuleListsEmpty(final JpaDistributionSetType dsType) {
return CollectionUtils.isEmpty(dsType.elements) && CollectionUtils.isEmpty(elements);
}
private JpaDistributionSetType setModuleType(final SoftwareModuleType smType, final boolean mandatory) {

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java
View File

@@ -38,7 +38,6 @@ import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -58,7 +57,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* JPA implementation of a {@link Rollout}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor needed for JPA entities.
@NoArgsConstructor // Default constructor needed for JPA entities.
@Entity
@Table(name = "sp_rollout", uniqueConstraints = @UniqueConstraint(columnNames = { "name", "tenant" }, name = "uk_rollout"))
@NamedEntityGraphs({ @NamedEntityGraph(name = "Rollout.ds", attributeNodes = { @NamedAttributeNode("distributionSet") }) })

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java
View File

@@ -30,7 +30,6 @@ import jakarta.persistence.UniqueConstraint;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -45,7 +44,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* JPA entity definition of persisting a group of an rollout.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor needed for JPA entities.
@NoArgsConstructor // Default constructor needed for JPA entities.
@Entity
@Table(name = "sp_rolloutgroup", uniqueConstraints = @UniqueConstraint(columnNames = { "name", "rollout", "tenant" }, name = "uk_rolloutgroup"))
// exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for sub entities

2
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java
View File

@@ -50,7 +50,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* Base Software Module that is supported by OS level provisioning mechanism on the edge controller, e.g. OS, JVM, AgentHub.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Setter
@Getter
@ToString(callSuper = true)

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleMetadata.java
View File

@@ -22,7 +22,6 @@ import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@@ -33,7 +32,7 @@ import org.eclipse.hawkbit.repository.model.SoftwareModuleMetadata;
/**
* Metadata for {@link SoftwareModule}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)

6
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java
View File

@@ -18,7 +18,6 @@ import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import jakarta.validation.constraints.Min;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -31,7 +30,8 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* Type of software modules.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Getter
@Entity
@Table(name = "sp_software_module_type", indexes = {
@Index(name = "sp_idx_software_module_type_01", columnList = "tenant,deleted"),
@@ -45,13 +45,11 @@ public class JpaSoftwareModuleType extends AbstractJpaTypeEntity implements Soft
@Serial
private static final long serialVersionUID = 1L;
@Getter
@Column(name = "max_ds_assignments", nullable = false)
@Min(1)
private int maxAssignments;
@Setter
@Getter
@Column(name = "deleted")
private boolean deleted;

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTag.java
View File

@@ -15,7 +15,6 @@ import jakarta.persistence.Column;
import jakarta.persistence.MappedSuperclass;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -24,7 +23,7 @@ import org.eclipse.hawkbit.repository.model.Tag;
/**
* A Tag can be used as describing and organizational meta information for any kind of entity.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Setter
@Getter
@MappedSuperclass

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
View File

@@ -42,7 +42,6 @@ import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -69,7 +68,7 @@ import org.springframework.util.ObjectUtils;
/**
* JPA implementation of {@link Target}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Entity
@Table(name = "sp_target",
indexes = {

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java
View File

@@ -25,7 +25,6 @@ import jakarta.persistence.UniqueConstraint;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -41,7 +40,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* Stored target filter.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Setter
@Getter
@Entity

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetMetadata.java
View File

@@ -21,7 +21,6 @@ import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -31,7 +30,7 @@ import org.eclipse.hawkbit.repository.model.TargetMetadata;
/**
* Meta data for {@link Target}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Setter
@Getter
@IdClass(TargetMetadataCompositeKey.class)

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java
View File

@@ -16,7 +16,6 @@ import jakarta.persistence.Index;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.eclipse.hawkbit.repository.event.remote.TargetTagDeletedEvent;
@@ -28,7 +27,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* A {@link TargetTag} is used to describe Target attributes and use them also for filtering the target list.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@ToString(callSuper = true)
@Entity
@Table(name = "sp_target_tag", indexes = { @Index(name = "sp_idx_target_tag_prim", columnList = "tenant,id"),

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java
View File

@@ -24,7 +24,6 @@ import jakarta.persistence.ManyToMany;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.eclipse.hawkbit.repository.event.remote.TargetTypeDeletedEvent;
@@ -38,7 +37,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* A target type defines which distribution set types can or have to be {@link Target}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@ToString(callSuper = true)
@Entity
@Table(name = "sp_target_type", indexes = {

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java
View File

@@ -19,7 +19,6 @@ import jakarta.persistence.UniqueConstraint;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -32,7 +31,7 @@ import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
/**
* A JPA entity which stores the tenant specific configuration.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Setter
@Getter
@Entity

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantMetaData.java
View File

@@ -25,7 +25,6 @@ import jakarta.persistence.UniqueConstraint;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@@ -40,7 +39,7 @@ import org.eclipse.hawkbit.repository.model.TenantMetaData;
*
* Entities owned by the tenant are based on {@link TenantAwareBaseEntity}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Setter
@Getter
@Table(name = "sp_tenant", indexes = {

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroup.java
View File

@@ -26,7 +26,6 @@ import jakarta.persistence.ManyToOne;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.RolloutGroup;
import org.eclipse.hawkbit.repository.model.Target;
@@ -34,7 +33,7 @@ import org.eclipse.hawkbit.repository.model.Target;
/**
* Entity with JPA annotation to store the information which {@link Target} is in a specific {@link RolloutGroup}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@IdClass(RolloutTargetGroupId.class)
@Entity
@Table(name = "sp_rollouttargetgroup")

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroupId.java
View File

@@ -12,7 +12,6 @@ package org.eclipse.hawkbit.repository.jpa.model;
import java.io.Serial;
import java.io.Serializable;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.eclipse.hawkbit.repository.model.RolloutGroup;
@@ -21,7 +20,7 @@ import org.eclipse.hawkbit.repository.model.Target;
/**
* Combined unique key of the table {@link RolloutTargetGroup}.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Getter
public class RolloutTargetGroupId implements Serializable {

3
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java
View File

@@ -12,14 +12,13 @@ package org.eclipse.hawkbit.repository.jpa.model;
import java.io.Serial;
import java.io.Serializable;
import lombok.AccessLevel;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* The Software Module meta-data composite key which contains the meta-data key and the ID of the software module itself.
*/
@NoArgsConstructor(access = AccessLevel.PUBLIC) // Default constructor for JPA
@NoArgsConstructor // Default constructor for JPA
@Data
public final class SwMetadataCompositeKey implements Serializable {