[#2845] Bump Spring boot to 4.x (#2941)

Notes:
1. (!) Eclipselink shall be migrated to 5.0 (in 4.0.8 there are incompatible classes, e.g EJBQueryImpl doesn't implement some newer methods). In the moment is with beta (5.0.0-B12) - JUST for testing!
2. (!) Ethlo plugin doesn't work with Eclipselink 5.0, it builds with Eclipselink 4.0.8 (could be a problem)
3. Dependencies - new starters, test starters changes, some dependencies refactoring
4. Auto-configs split - package changes, some properties classes changes
5. Spring nullable org.springframework.lang.Nullable/NonNull are depecated and replaced with jspcify -> org.jspecify.annotations.Nullable/NonNull (NullMarked)
6. Lombok config - adding lombok.addNullAnnotations=jspecify - to do not mess annotations
7. Distributed lock table changes - SP_LOCK table db migration
8. Spring Retry replaced with Spring Core Retry - does repace retry in hawkbit
9. Specifications -> added Update/Delete(/Predicate) Specifications and JpaSpecificationExecutor changed
10. HawkbitBaseRepositoryFactoryBean modified to register properly
11. Jackson - 2 -> 3, package migrations, finals are not deserialized by default(enable finals deserialization, consider make non-final), too ‘smart’ tries to set complex objects instead of using non args constructor (-> @JsonIgnore), some other default configs made

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

hawkbit-ddi/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActivateAutoConfirmation.java

@@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)

hawkbit-ddi/hawkbit-ddi-resource/pom.xml

@@ -40,7 +40,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <groupId>tools.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-cbor</artifactId>
         </dependency>
 
@@ -64,5 +64,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

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

@@ -18,20 +18,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
-import com.fasterxml.jackson.dataformat.cbor.CBORGenerator;
-import com.fasterxml.jackson.dataformat.cbor.CBORParser;
 import org.eclipse.hawkbit.context.AccessContext;
 import org.eclipse.hawkbit.ddi.json.model.DdiActionFeedback;
 import org.eclipse.hawkbit.ddi.json.model.DdiAssignedVersion;
@@ -54,6 +45,11 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.core.JsonParser;
+import tools.jackson.core.json.JsonFactory;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.dataformat.cbor.CBORFactory;
 
 @ContextConfiguration(
         classes = { DdiApiConfiguration.class, RestConfiguration.class, JpaRepositoryConfiguration.class, TestConfiguration.class })
@@ -86,14 +82,13 @@ public abstract class AbstractDDiApiIntegrationTest extends AbstractRestIntegrat
      *
      * @param json JSON object to convert
      * @return Equivalent CBOR data
-     * @throws IOException Invalid JSON input
      */
-    protected static byte[] jsonToCbor(final String json) throws IOException {
+    protected static byte[] jsonToCbor(final String json) {
         final JsonFactory jsonFactory = new JsonFactory();
         final JsonParser jsonParser = jsonFactory.createParser(json);
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
         final CBORFactory cborFactory = new CBORFactory();
-        final CBORGenerator cborGenerator = cborFactory.createGenerator(out);
+        final JsonGenerator cborGenerator = cborFactory.createGenerator(out);
         while (jsonParser.nextToken() != null) {
             cborGenerator.copyCurrentEvent(jsonParser);
         }
@@ -106,11 +101,9 @@ public abstract class AbstractDDiApiIntegrationTest extends AbstractRestIntegrat
      *
      * @param input CBOR data to convert
      * @return Equivalent JSON string
-     * @throws IOException Invalid CBOR input
      */
-    protected static String cborToJson(final byte[] input) throws IOException {
-        final CBORFactory cborFactory = new CBORFactory();
-        final CBORParser cborParser = cborFactory.createParser(input);
+    protected static String cborToJson(final byte[] input) {
+        final JsonParser cborParser = new CBORFactory().createParser(input);
         final JsonFactory jsonFactory = new JsonFactory();
         final StringWriter stringWriter = new StringWriter();
         final JsonGenerator jsonGenerator = jsonFactory.createGenerator(stringWriter);
@@ -210,107 +203,92 @@ public abstract class AbstractDDiApiIntegrationTest extends AbstractRestIntegrat
                 controllerId + "/deploymentBase/" + actionId;
     }
 
-    protected String getJsonRejectedCancelActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.REJECTED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("rejected"));
+    protected String getJsonRejectedCancelActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.REJECTED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("rejected"));
     }
 
-    protected String getJsonRejectedDeploymentActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.REJECTED, DdiResult.FinalResult.NONE, Collections.singletonList("rejected"));
+    protected String getJsonRejectedDeploymentActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.REJECTED, DdiResult.FinalResult.NONE, Collections.singletonList("rejected"));
     }
 
-    protected String getJsonDownloadDeploymentActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.DOWNLOAD, DdiResult.FinalResult.NONE, Collections.singletonList("download"));
+    protected String getJsonDownloadDeploymentActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.DOWNLOAD, DdiResult.FinalResult.NONE, Collections.singletonList("download"));
     }
 
-    protected String getJsonDownloadedDeploymentActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.DOWNLOADED, DdiResult.FinalResult.NONE, Collections.singletonList("download"));
+    protected String getJsonDownloadedDeploymentActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.DOWNLOADED, DdiResult.FinalResult.NONE, Collections.singletonList("download"));
     }
 
-    protected String getJsonCanceledCancelActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.CANCELED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("canceled"));
+    protected String getJsonCanceledCancelActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.CANCELED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("canceled"));
     }
 
-    protected String getJsonCanceledDeploymentActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.CANCELED, DdiResult.FinalResult.NONE, Collections.singletonList("canceled"));
+    protected String getJsonCanceledDeploymentActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.CANCELED, DdiResult.FinalResult.NONE, Collections.singletonList("canceled"));
     }
 
-    protected String getJsonScheduledCancelActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.SCHEDULED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("scheduled"));
+    protected String getJsonScheduledCancelActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.SCHEDULED, DdiResult.FinalResult.SUCCESS,
+                Collections.singletonList("scheduled"));
     }
 
-    protected String getJsonScheduledDeploymentActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.SCHEDULED, DdiResult.FinalResult.NONE, Collections.singletonList("scheduled"));
+    protected String getJsonScheduledDeploymentActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.SCHEDULED, DdiResult.FinalResult.NONE, Collections.singletonList("scheduled"));
     }
 
-    protected String getJsonResumedCancelActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.RESUMED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("resumed"));
+    protected String getJsonResumedCancelActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.RESUMED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("resumed"));
     }
 
-    protected String getJsonResumedDeploymentActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.RESUMED, DdiResult.FinalResult.NONE, Collections.singletonList("resumed"));
+    protected String getJsonResumedDeploymentActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.RESUMED, DdiResult.FinalResult.NONE, Collections.singletonList("resumed"));
     }
 
-    protected String getJsonProceedingCancelActionFeedback() throws JsonProcessingException {
+    protected String getJsonProceedingCancelActionFeedback() {
         return getJsonActionFeedback(
                 DdiStatus.ExecutionStatus.PROCEEDING, DdiResult.FinalResult.SUCCESS, Collections.singletonList("proceeding"));
     }
 
-    protected String getJsonProceedingDeploymentActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.PROCEEDING, DdiResult.FinalResult.NONE, Collections.singletonList("proceeding"));
+    protected String getJsonProceedingDeploymentActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.PROCEEDING, DdiResult.FinalResult.NONE, Collections.singletonList("proceeding"));
     }
 
-    protected String getJsonClosedCancelActionFeedback() throws JsonProcessingException {
-        return getJsonActionFeedback(
-                DdiStatus.ExecutionStatus.CLOSED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("closed"));
+    protected String getJsonClosedCancelActionFeedback() {
+        return getJsonActionFeedback(DdiStatus.ExecutionStatus.CLOSED, DdiResult.FinalResult.SUCCESS, Collections.singletonList("closed"));
     }
 
-    protected String getJsonClosedDeploymentActionFeedback() throws JsonProcessingException {
+    protected String getJsonClosedDeploymentActionFeedback() {
         return getJsonActionFeedback(DdiStatus.ExecutionStatus.CLOSED, DdiResult.FinalResult.NONE, Collections.singletonList("closed"));
     }
 
-    protected String getJsonActionFeedback(
-            final DdiStatus.ExecutionStatus executionStatus, final DdiResult.FinalResult finalResult) throws JsonProcessingException {
+    protected String getJsonActionFeedback(final DdiStatus.ExecutionStatus executionStatus, final DdiResult.FinalResult finalResult) {
         return getJsonActionFeedback(executionStatus, finalResult, Collections.singletonList(randomString(1000)));
     }
 
     protected String getJsonActionFeedback(
-            final DdiStatus.ExecutionStatus executionStatus, final DdiResult ddiResult,
-            final List<String> messages) throws JsonProcessingException {
+            final DdiStatus.ExecutionStatus executionStatus, final DdiResult ddiResult, final List<String> messages) {
         final DdiStatus ddiStatus = new DdiStatus(executionStatus, ddiResult, null, messages);
         return OBJECT_MAPPER.writeValueAsString(new DdiActionFeedback(ddiStatus));
     }
 
     protected String getJsonActionFeedback(
-            final DdiStatus.ExecutionStatus executionStatus,
-            final DdiResult.FinalResult finalResult, final List<String> messages) throws JsonProcessingException {
+            final DdiStatus.ExecutionStatus executionStatus, final DdiResult.FinalResult finalResult, final List<String> messages) {
         return getJsonActionFeedback(executionStatus, finalResult, null, messages);
     }
 
     protected String getJsonActionFeedback(
             final DdiStatus.ExecutionStatus executionStatus,
-            final DdiResult.FinalResult finalResult, final Integer code, final List<String> messages) throws JsonProcessingException {
+            final DdiResult.FinalResult finalResult, final Integer code, final List<String> messages) {
         final DdiStatus ddiStatus = new DdiStatus(executionStatus, new DdiResult(finalResult, new DdiProgress(2, 5)), code, messages);
         return OBJECT_MAPPER.writeValueAsString(new DdiActionFeedback(ddiStatus));
     }
 
     protected String getJsonConfirmationFeedback(
-            final DdiConfirmationFeedback.Confirmation confirmation,
-            final Integer code, final List<String> messages) throws JsonProcessingException {
+            final DdiConfirmationFeedback.Confirmation confirmation, final Integer code, final List<String> messages) {
         return OBJECT_MAPPER.writeValueAsString(new DdiConfirmationFeedback(confirmation, code, messages));
     }
 
-    protected String getJsonInstalledBase(String name, String version) throws JsonProcessingException {
+    protected String getJsonInstalledBase(final String name, final String version) {
         return OBJECT_MAPPER.writeValueAsString(new DdiAssignedVersion(name, version));
     }
 

hawkbit-ddi/hawkbit-ddi-server/pom.xml

@@ -32,6 +32,11 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+        </dependency>
+
         <!-- Database -->
         <dependency>
             <groupId>com.h2database</groupId>

hawkbit-ddi/hawkbit-ddi-starter/pom.xml

@@ -53,7 +53,7 @@
         <!-- Spring - START -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

hawkbit-ddi/hawkbit-ddi-starter/src/main/java/org/eclipse/hawkbit/autoconfigure/ddi/ControllerDownloadSecurityConfiguration.java

@@ -76,7 +76,7 @@ class ControllerDownloadSecurityConfiguration {
 
     @Bean
     @Order(300) // higher priority than HawkBit DDI security, so that the DDI DL security is applied first
-    protected SecurityFilterChain filterChainDDIDL(final HttpSecurity http) throws Exception {
+    protected SecurityFilterChain filterChainDDIDL(final HttpSecurity http) {
         http
                 .securityMatcher(DDI_DL_ANT_MATCHER)
                 .authorizeHttpRequests(amrmRegistry -> amrmRegistry.anyRequest().authenticated())