Upgrades spring to 3.4.0

hawkbit-ddi/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/RequestOnHawkbitDefaultPortPostProcessor.java

@@ -11,13 +11,11 @@
 
 import static org.eclipse.hawkbit.ddi.rest.resource.AbstractDDiApiIntegrationTest.HTTP_PORT;
 
-import org.jetbrains.annotations.NotNull;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
 
 public class RequestOnHawkbitDefaultPortPostProcessor implements RequestPostProcessor {
 
-    @NotNull
     @Override
     public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
         request.setRemotePort(HTTP_PORT);

hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/AbstractManagementApiIntegrationTest.java

@@ -13,6 +13,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 
+import lombok.SneakyThrows;
 import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType;
 import org.eclipse.hawkbit.repository.jpa.Jpa;
 import org.eclipse.hawkbit.repository.jpa.RepositoryApplicationConfiguration;
@@ -184,13 +185,15 @@ protected static ResultMatcher applySelfLinkMatcherOnSingleResult(final String l
         return mvcResult -> jsonPath("_links.self.href", equalTo(link)).match(mvcResult);
     }
 
+    @SneakyThrows
     protected static JSONObject getAssignmentObject(final Object id, final MgmtActionType type) {
         final JSONObject obj = new JSONObject();
         obj.put("id", id);
         obj.put("type", type.getName());
         return obj;
     }
 
+    @SneakyThrows
     protected static JSONObject getAssignmentObject(final Object id, final MgmtActionType type, final int weight) {
         return getAssignmentObject(id, type).put("weight", weight);
     }

hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResourceTest.java

@@ -15,6 +15,8 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.util.Base64;
+
 import io.qameta.allure.Description;
 import io.qameta.allure.Feature;
 import io.qameta.allure.Story;
@@ -46,7 +48,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.util.Base64Utils;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -105,7 +106,7 @@ public void validateBasicAuthFailsWithInvalidCredentials() throws Exception {
     }
 
     private String getBasicAuth(final String username, final String password) {
-        return "Basic " + Base64Utils.encodeToString((username + ":" + password).getBytes());
+        return "Basic " + Base64.getEncoder().encodeToString((username + ":" + password).getBytes());
     }
 
     private MockMvc withSecurityMock() throws Exception {

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/EntityFactory.java

@@ -113,5 +113,4 @@ MetaData generateTargetMetadata(@Size(min = 1, max = MetaData.KEY_MAX_SIZE) @Not
      * @return {@link TargetFilterQueryBuilder} object
      */
     TargetFilterQueryBuilder targetFilterQuery();
-
-}
+}

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Artifact.java

@@ -48,5 +48,4 @@ public interface Artifact extends TenantAwareBaseEntity {
      * @return size of the artifact in bytes.
      */
     long getSize();
-
-}
+}

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaEntityFactory.java

@@ -41,28 +41,21 @@ public class JpaEntityFactory implements EntityFactory {
 
     @Autowired
     private DistributionSetBuilder distributionSetBuilder;
-
     @Autowired
     private TargetBuilder targetBuilder;
-
     @Autowired
     private DistributionSetTypeBuilder distributionSetTypeBuilder;
-
     @Autowired
     private SoftwareModuleBuilder softwareModuleBuilder;
-
     @Autowired
     private RolloutBuilder rolloutBuilder;
-
     @Autowired
     private TargetFilterQueryBuilder targetFilterQueryBuilder;
-
     @Autowired
     private SoftwareModuleMetadataBuilder softwareModuleMetadataBuilder;
-
     @Autowired
     private TargetTypeBuilder targetTypeBuilder;
-
+    
     @Override
     public ActionStatusBuilder actionStatus() {
         return new JpaActionStatusBuilder();
@@ -132,5 +125,4 @@ public TargetTypeBuilder targetType() {
     public TargetFilterQueryBuilder targetFilterQuery() {
         return targetFilterQueryBuilder;
     }
-
-}
+}

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaArtifactManagement.java

@@ -317,7 +317,7 @@ private Artifact storeArtifactMetadata(final SoftwareModule softwareModule, fina
         }
         artifact.setMd5Hash(result.getHashes().getMd5());
         artifact.setSha256Hash(result.getHashes().getSha256());
-        artifact.setSize(result.getSize());
+        artifact.setFileSize(result.getSize());
 
         log.debug("storing new artifact into repository {}", artifact);
         return localArtifactRepository.save(AccessController.Operation.CREATE, artifact);

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/OnlineDsAssignmentStrategy.java

@@ -132,8 +132,7 @@ public void setAssignedDistributionSetAndTargetStatus(final JpaDistributionSet s
                     targetRepository.byIdsSpec(targetIdsChunk)) != targetIdsChunk.size()) {
                 throw new InsufficientPermissionException("No update access to all targets!");
             }
-            targetRepository.setAssignedDistributionSetAndUpdateStatus(TargetUpdateStatus.PENDING,
-                    set, now, currentUser, targetIdsChunk);
+            targetRepository.setAssignedDistributionSetAndUpdateStatus(set, now, currentUser, TargetUpdateStatus.PENDING, targetIdsChunk);
             // TODO AC - current problem with this approach is that the caller detach the targets and seems doesn't save them
 //            targetRepository.saveAll(
 //                targetRepository

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java

@@ -67,9 +67,11 @@
 @NamedEntityGraphs({
         @NamedEntityGraph(name = "Action.ds", attributeNodes = { @NamedAttributeNode("distributionSet") }),
         @NamedEntityGraph(name = "Action.all", attributeNodes = {
-                @NamedAttributeNode("distributionSet"),
-                @NamedAttributeNode(value = "target", subgraph = "target.ds") },
-                subgraphs = @NamedSubgraph(name = "target.ds", attributeNodes = @NamedAttributeNode("assignedDistributionSet")))
+                @NamedAttributeNode(value = "target", subgraph = "target.ds"),
+                @NamedAttributeNode("distributionSet") },
+                subgraphs = @NamedSubgraph(
+                        name = "target.ds",
+                        attributeNodes = @NamedAttributeNode("assignedDistributionSet")))
 })
 @Entity
 // exception squid:S2160 - BaseEntity equals/hashcode is handling correctly for sub entities

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

@@ -75,7 +75,7 @@ public class JpaArtifact extends AbstractJpaTenantAwareBaseEntity implements Art
     private String sha256Hash;
 
     @Column(name = "file_size", updatable = false)
-    private long size;
+    private long fileSize;
 
     /**
      * Constructs artifact.
@@ -90,4 +90,9 @@ public JpaArtifact(@NotEmpty final String sha1Hash, @NotNull final String filena
         this.softwareModule = (JpaSoftwareModule) softwareModule;
         this.softwareModule.addArtifact(this);
     }
+
+    @Override
+    public long getSize() {
+        return getFileSize();
+    }
 }

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

@@ -15,7 +15,7 @@
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ForeignKey;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.OneToOne;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Size;
 
@@ -33,7 +33,8 @@
 @Table(name = "sp_target_conf_status")
 public class JpaAutoConfirmationStatus extends AbstractJpaTenantAwareBaseEntity implements AutoConfirmationStatus {
 
-    @OneToOne(optional = false, fetch = FetchType.LAZY)
+    // actually it is OneToOne - but lazy loading is not supported for OneToOne (at least for hibernate 6.6.2)
+    @ManyToOne(optional = false, fetch = FetchType.LAZY)
     @JoinColumn(name = "target_id", nullable = false, foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_target_auto_conf"))
     private JpaTarget target;
 

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

@@ -35,7 +35,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MapKeyColumn;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.PrimaryKeyJoinColumn;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
@@ -65,6 +64,7 @@
 import org.eclipse.hawkbit.repository.model.helper.SystemSecurityContextHolder;
 import org.eclipse.hawkbit.repository.model.helper.TenantConfigurationManagementHolder;
 import org.eclipse.hawkbit.security.SystemSecurityContext;
+import org.springframework.util.ObjectUtils;
 
 /**
  * JPA implementation of {@link Target}.
@@ -140,11 +140,10 @@ public class JpaTarget extends AbstractJpaNamedEntity implements Target, EventAw
     // set default request controller attributes to true, because we want to request them the first time
     private boolean requestControllerAttributes = true;
 
-    @Setter
-    @Getter
-    @OneToOne(fetch = FetchType.LAZY, mappedBy = "target", cascade = { CascadeType.ALL }, orphanRemoval = true)
+    // actually it is OneToOne - but lazy loading is not supported for OneToOne (at least for hibernate 6.6.2)
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "target", cascade = { CascadeType.ALL }, orphanRemoval = true)
     @PrimaryKeyJoinColumn
-    private JpaAutoConfirmationStatus autoConfirmationStatus;
+    private List<JpaAutoConfirmationStatus> autoConfirmationStatus;
 
     @Setter
     @Getter
@@ -242,6 +241,19 @@ public PollStatus getPollStatus() {
                 .apply(this);
     }
 
+    public JpaAutoConfirmationStatus getAutoConfirmationStatus() {
+        return ObjectUtils.isEmpty(autoConfirmationStatus) ? null : autoConfirmationStatus.get(0);
+    }
+
+    public void setAutoConfirmationStatus(final JpaAutoConfirmationStatus autoConfirmationStatus) {
+        if (this.autoConfirmationStatus == null) {
+            this.autoConfirmationStatus = new ArrayList<>();
+        } else {
+            this.autoConfirmationStatus.clear();
+        }
+        this.autoConfirmationStatus.add(autoConfirmationStatus);
+    }
+
     public void addTag(final TargetTag tag) {
         if (tags == null) {
             tags = new HashSet<>();

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/ActionRepository.java

@@ -44,7 +44,7 @@ public interface ActionRepository extends BaseEntityRepository<JpaAction> {
      * @return the found {@link Action}
      */
     @EntityGraph(value = "Action.all", type = EntityGraphType.LOAD)
-    Optional<Action> findWithDetailsById(Long actionId);
+    Optional<Action> findWithDetailsById(@Param("id") Long actionId);
 
     /**
      * Retrieves the latest finished {@link Action} for given target and {@link DistributionSet}.

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/LocalArtifactRepository.java

@@ -31,7 +31,7 @@ public interface LocalArtifactRepository extends BaseEntityRepository<JpaArtifac
      *
      * @return sum of artifacts size in bytes
      */
-    @Query("SELECT SUM(la.size) FROM JpaArtifact la WHERE la.softwareModule.deleted = false")
+    @Query("SELECT SUM(a.fileSize) FROM JpaArtifact a WHERE a.softwareModule.deleted = false")
     Optional<Long> sumOfNonDeletedArtifactSize();
 
     /**

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/repository/TargetRepository.java

@@ -50,10 +50,10 @@ default JpaTarget getByControllerId(final String controllerId) {
     @Deprecated(forRemoval = true)
     @Modifying
     @Transactional
-    @Query("UPDATE JpaTarget t SET t.assignedDistributionSet = :set, t.lastModifiedAt = :lastModifiedAt, t.lastModifiedBy = :lastModifiedBy, t.updateStatus = :status WHERE t.id IN :targets")
-    void setAssignedDistributionSetAndUpdateStatus(@Param("status") TargetUpdateStatus status,
-            @Param("set") JpaDistributionSet set, @Param("lastModifiedAt") Long modifiedAt,
-            @Param("lastModifiedBy") String modifiedBy, @Param("targets") Collection<Long> targets);
+    @Query("UPDATE JpaTarget t SET t.assignedDistributionSet = :dSet, t.lastModifiedAt = :lastModifiedAt, t.lastModifiedBy = :lastModifiedBy, t.updateStatus = :status WHERE t.id IN :targets")
+    void setAssignedDistributionSetAndUpdateStatus(
+            @Param("dSet") JpaDistributionSet set, @Param("lastModifiedAt") Long modifiedAt, @Param("lastModifiedBy") String modifiedBy, @Param("status") TargetUpdateStatus status,
+            @Param("targets") Collection<Long> targets);
 
     // TODO AC - remove it and use specification
 
@@ -64,9 +64,10 @@ void setAssignedDistributionSetAndUpdateStatus(@Param("status") TargetUpdateStat
     @Deprecated(forRemoval = true)
     @Modifying
     @Transactional
-    @Query("UPDATE JpaTarget t SET t.assignedDistributionSet = :set, t.installedDistributionSet = :set, t.installationDate = :lastModifiedAt, t.lastModifiedAt = :lastModifiedAt, t.lastModifiedBy = :lastModifiedBy, t.updateStatus = :status WHERE t.id IN :targets")
-    void setAssignedAndInstalledDistributionSetAndUpdateStatus(@Param("status") TargetUpdateStatus status,
-            @Param("set") JpaDistributionSet set, @Param("lastModifiedAt") Long modifiedAt,
+    @Query("UPDATE JpaTarget t SET t.assignedDistributionSet = :dSet, t.installedDistributionSet = :dSet, t.installationDate = :lastModifiedAt, t.lastModifiedAt = :lastModifiedAt, t.lastModifiedBy = :lastModifiedBy, t.updateStatus = :status WHERE t.id IN :targets")
+    void setAssignedAndInstalledDistributionSetAndUpdateStatus(
+            @Param("status") TargetUpdateStatus status,
+            @Param("dSet") JpaDistributionSet distributionSet, @Param("lastModifiedAt") Long modifiedAt,
             @Param("lastModifiedBy") String modifiedBy, @Param("targets") Collection<Long> targets);
 
     /**

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java

@@ -114,7 +114,7 @@ void canceledAndFailedActionsAreCleanedUp() {
         autoActionCleanup.run();
 
         assertThat(actionRepository.count()).isEqualTo(1);
-        assertThat(actionRepository.findWithDetailsById(action3)).isPresent();
+        assertThat(actionRepository.findById(action3)).isPresent();
     }
 
     @Test
@@ -145,8 +145,8 @@ void canceledActionsAreCleanedUp() {
         autoActionCleanup.run();
 
         assertThat(actionRepository.count()).isEqualTo(2);
-        assertThat(actionRepository.findWithDetailsById(action2)).isPresent();
-        assertThat(actionRepository.findWithDetailsById(action3)).isPresent();
+        assertThat(actionRepository.findById(action2)).isPresent();
+        assertThat(actionRepository.findById(action3)).isPresent();
     }
 
     @Test
@@ -184,7 +184,7 @@ void canceledAndFailedActionsAreCleanedUpWhenExpired() throws InterruptedExcepti
         autoActionCleanup.run();
 
         assertThat(actionRepository.count()).isEqualTo(1);
-        assertThat(actionRepository.findWithDetailsById(action3)).isPresent();
+        assertThat(actionRepository.findById(action3)).isPresent();
     }
 
     private void setActionToCanceled(final Long id) {

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ControllerManagementTest.java

@@ -1879,7 +1879,7 @@ private void assertInstalledDistributionSetId(final String controllerId, final L
     }
 
     private void assertLastActionStatusCodeInAction(final Long actionId, final Integer expectedLastActionStatusCode) {
-        final Optional<Action> action = actionRepository.findWithDetailsById(actionId);
+        final Optional<Action> action = actionRepository.findById(actionId).map(Action.class::cast);
         assertThat(action).isPresent();
         assertThat(action.get().getLastActionStatusCode()).isEqualTo(Optional.ofNullable(expectedLastActionStatusCode));
     }

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java

@@ -996,8 +996,8 @@ void weightValidatedAndSaved() {
                 deploymentManagement.assignDistributionSets(Collections.singletonList(valideRequest1)).get(0)).getId();
         final Long valideActionId2 = getFirstAssignedAction(
                 deploymentManagement.assignDistributionSets(Collections.singletonList(valideRequest2)).get(0)).getId();
-        assertThat(actionRepository.findWithDetailsById(valideActionId1).get().getWeight()).get().isEqualTo(Action.WEIGHT_MAX);
-        assertThat(actionRepository.findWithDetailsById(valideActionId2).get().getWeight()).get().isEqualTo(Action.WEIGHT_MIN);
+        assertThat(actionRepository.findById(valideActionId1).get().getWeight()).get().isEqualTo(Action.WEIGHT_MAX);
+        assertThat(actionRepository.findById(valideActionId2).get().getWeight()).get().isEqualTo(Action.WEIGHT_MIN);
     }
 
     /**

hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java

@@ -24,7 +24,6 @@
 import org.eclipse.hawkbit.repository.model.Action.ActionType;
 import org.eclipse.hawkbit.repository.model.Action.Status;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.PageRequest;
@@ -91,7 +90,7 @@ public void testFilterByParameterExtRef() {
         assertRSQLQuery(ActionFields.EXTERNALREF.name() + "==extRef*", 10);
     }
 
-    private @NotNull JpaAction newJpaAction(final DistributionSet dsA, final boolean active, final String extRef) {
+    private JpaAction newJpaAction(final DistributionSet dsA, final boolean active, final String extRef) {
         final JpaAction newAction = new JpaAction();
         newAction.setActionType(ActionType.SOFT);
         newAction.setDistributionSet(dsA);