diff --git a/hawkbit-ddi/hawkbit-ddi-api/pom.xml b/hawkbit-ddi/hawkbit-ddi-api/pom.xml index bc630afb6..06458461f 100644 --- a/hawkbit-ddi/hawkbit-ddi-api/pom.xml +++ b/hawkbit-ddi/hawkbit-ddi-api/pom.xml @@ -30,39 +30,15 @@ org.eclipse.hawkbit - hawkbit-rest-core + hawkbit-rest-api ${project.version} - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - - jakarta.validation - jakarta.validation-api - - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - - io.github.classgraph classgraph test - - org.assertj - assertj-core - test - diff --git a/hawkbit-ddi/hawkbit-ddi-resource/pom.xml b/hawkbit-ddi/hawkbit-ddi-resource/pom.xml index 0d64f73f4..a8cbde685 100644 --- a/hawkbit-ddi/hawkbit-ddi-resource/pom.xml +++ b/hawkbit-ddi/hawkbit-ddi-resource/pom.xml @@ -40,17 +40,18 @@ - org.springframework.plugin - spring-plugin-core - - - - jakarta.servlet - jakarta.servlet-api - provided + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + + org.eclipse.hawkbit + hawkbit-rest-core + ${project.version} + tests + test + org.eclipse.hawkbit hawkbit-repository-test @@ -63,32 +64,5 @@ ${project.version} test - - org.eclipse.hawkbit - hawkbit-rest-core - ${project.version} - tests - test - - - org.springframework.security - spring-security-config - test - - - org.springframework.boot - spring-boot-starter-json - test - - - org.springframework.security - spring-security-aspects - test - - - org.springframework - spring-context-support - test - \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml b/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml index ae11db81c..91e290143 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml +++ b/hawkbit-mgmt/hawkbit-mgmt-api/pom.xml @@ -28,31 +28,8 @@ org.eclipse.hawkbit - hawkbit-rest-core + hawkbit-rest-api ${project.version} - - - org.springframework.hateoas - spring-hateoas - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - - org.springframework - spring-webmvc - test - - - org.springframework.boot - spring-boot-starter-json - - - jakarta.validation - jakarta.validation-api - \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/pom.xml b/hawkbit-mgmt/hawkbit-mgmt-resource/pom.xml index f5fc614b6..90a10b622 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/pom.xml +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/pom.xml @@ -23,11 +23,6 @@ hawkBit :: Management :: REST Resources - - org.eclipse.hawkbit - hawkbit-repository-api - ${project.version} - org.eclipse.hawkbit hawkbit-mgmt-api @@ -38,27 +33,20 @@ hawkbit-rest-core ${project.version} - - org.springframework.security - spring-security-config - - - org.springframework - spring-context - - - org.springframework.plugin - spring-plugin-core - - - - jakarta.servlet - jakarta.servlet-api - provided + org.eclipse.hawkbit + hawkbit-repository-api + ${project.version} + + org.eclipse.hawkbit + hawkbit-rest-core + ${project.version} + tests + test + org.eclipse.hawkbit hawkbit-repository-test @@ -71,27 +59,5 @@ ${project.version} test - - org.eclipse.hawkbit - hawkbit-rest-core - ${project.version} - tests - test - - - org.springframework.boot - spring-boot-starter-json - test - - - org.springframework.security - spring-security-aspects - test - - - org.springframework - spring-context-support - test - \ No newline at end of file diff --git a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java index a4f9d63bb..00be12422 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java +++ b/hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java @@ -288,8 +288,7 @@ public class MgmtSoftwareModuleTypeResourceTest extends AbstractManagementApiInt @WithUser(principal = "uploadTester", allSpPermissions = true) public void deleteSoftwareModuleTypeUsed() throws Exception { final SoftwareModuleType testType = createTestType(); - softwareModuleManagement - .create(SoftwareModuleManagement.Create.builder().type(testType).name("name").version("version").build()); + softwareModuleManagement.create(SoftwareModuleManagement.Create.builder().type(testType).name("name").version("version").build()); assertThat(softwareModuleTypeManagement.count()).isEqualTo(4); diff --git a/hawkbit-repository/hawkbit-repository-api/pom.xml b/hawkbit-repository/hawkbit-repository-api/pom.xml index b09875707..3dceb304d 100644 --- a/hawkbit-repository/hawkbit-repository-api/pom.xml +++ b/hawkbit-repository/hawkbit-repository-api/pom.xml @@ -32,16 +32,6 @@ hawkbit-artifact-api ${project.version} - - org.eclipse.hawkbit - hawkbit-core - ${project.version} - - - - jakarta.validation - jakarta.validation-api - com.fasterxml.jackson.core diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java index 8e0fe4a4d..de9fe169d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java @@ -71,7 +71,9 @@ public class EntityNotFoundException extends AbstractServerRtException { .filter(id -> !found.contains(id)) .map(String::valueOf) .collect(Collectors.joining(",")))), - Map.of(TYPE, type.getSimpleName(), ENTITY_ID, expected.stream().filter(id -> !found.contains(id)).map(String::valueOf))); + Map.of( + TYPE, type.getSimpleName(), + ENTITY_ID, expected.stream().filter(id -> !found.contains(id)).map(String::valueOf).toList())); } private static String toEntityString(final Object obj) { diff --git a/hawkbit-rest/hawkbit-rest-api/pom.xml b/hawkbit-rest/hawkbit-rest-api/pom.xml new file mode 100644 index 000000000..81e66b7f3 --- /dev/null +++ b/hawkbit-rest/hawkbit-rest-api/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + org.eclipse.hawkbit + hawkbit-rest + ${revision} + + + hawkbit-rest-api + hawkBit :: REST :: API + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + + org.springframework.hateoas + spring-hateoas + + + \ No newline at end of file diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java b/hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java similarity index 100% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java rename to hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/OpenApi.java diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java b/hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java similarity index 100% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java rename to hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ResponseList.java b/hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/json/model/ResponseList.java similarity index 100% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ResponseList.java rename to hawkbit-rest/hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/json/model/ResponseList.java diff --git a/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java b/hawkbit-rest/hawkbit-rest-api/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java similarity index 100% rename from hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java rename to hawkbit-rest/hawkbit-rest-api/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java diff --git a/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml similarity index 73% rename from hawkbit-rest-core/pom.xml rename to hawkbit-rest/hawkbit-rest-core/pom.xml index 24e066f0c..bf8e843aa 100644 --- a/hawkbit-rest-core/pom.xml +++ b/hawkbit-rest/hawkbit-rest-core/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.hawkbit - hawkbit-parent + hawkbit-rest ${revision} @@ -22,6 +22,11 @@ hawkBit :: REST :: Core + + org.eclipse.hawkbit + hawkbit-rest-api + ${project.version} + org.eclipse.hawkbit hawkbit-core @@ -33,40 +38,14 @@ ${project.version} - - org.springframework.boot - spring-boot-starter-web - org.springframework.security spring-security-web - - org.springframework.hateoas - spring-hateoas - org.springframework spring-tx - - org.springframework.data - spring-data-commons - - - org.springframework.boot - spring-boot-starter-json - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - - - - jakarta.servlet - jakarta.servlet-api - provided - commons-io @@ -77,13 +56,13 @@ org.eclipse.hawkbit - hawkbit-repository-test + hawkbit-repository-jpa ${project.version} test org.eclipse.hawkbit - hawkbit-repository-jpa + hawkbit-repository-test ${project.version} test diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java similarity index 99% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java index f5bf1da28..df3f07018 100644 --- a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java @@ -29,7 +29,7 @@ import org.eclipse.hawkbit.exception.SpServerError; import org.eclipse.hawkbit.rest.exception.MessageNotReadableException; import org.eclipse.hawkbit.rest.exception.MultiPartFileUploadException; import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; -import org.eclipse.hawkbit.rest.util.FileStreamingFailedException; +import org.eclipse.hawkbit.rest.exception.FileStreamingFailedException; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/SecurityManagedConfiguration.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/SecurityManagedConfiguration.java similarity index 100% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/SecurityManagedConfiguration.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/SecurityManagedConfiguration.java diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingFailedException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/FileStreamingFailedException.java similarity index 96% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingFailedException.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/FileStreamingFailedException.java index dbaa5f879..c09c0b33d 100644 --- a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingFailedException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/FileStreamingFailedException.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.rest.util; +package org.eclipse.hawkbit.rest.exception; import java.io.Serial; diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java similarity index 96% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java index a2f0ef00c..12892d917 100644 --- a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java @@ -15,8 +15,7 @@ import org.eclipse.hawkbit.exception.AbstractServerRtException; import org.eclipse.hawkbit.exception.SpServerError; /** - * Exception which is thrown in case an request body is not well formatted and - * cannot be parsed. + * Exception which is thrown in case an request body is not well formatted and cannot be parsed. */ public class MessageNotReadableException extends AbstractServerRtException { diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java similarity index 100% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/security/DosFilter.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/security/DosFilter.java similarity index 97% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/security/DosFilter.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/security/DosFilter.java index 7fcb02eca..1d449def1 100644 --- a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/security/DosFilter.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/security/DosFilter.java @@ -43,11 +43,9 @@ public class DosFilter extends OncePerRequestFilter { private final Pattern ipAddressBlacklist; - private final Cache readCountCache = Caffeine.newBuilder() - .expireAfterWrite(1, TimeUnit.SECONDS).build(); + private final Cache readCountCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.SECONDS).build(); - private final Cache writeCountCache = Caffeine.newBuilder() - .expireAfterWrite(1, TimeUnit.SECONDS).build(); + private final Cache writeCountCache = Caffeine.newBuilder().expireAfterWrite(1, TimeUnit.SECONDS).build(); private final int maxRead; private final int maxWrite; diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java similarity index 99% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java index abaf92423..4b814eefe 100644 --- a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java @@ -27,6 +27,7 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.eclipse.hawkbit.artifact.model.ArtifactStream; +import org.eclipse.hawkbit.rest.exception.FileStreamingFailedException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java similarity index 100% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java diff --git a/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java similarity index 100% rename from hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java rename to hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java diff --git a/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java similarity index 100% rename from hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java rename to hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java diff --git a/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/ExcludePathAwareShallowETagFilterTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/ExcludePathAwareShallowETagFilterTest.java similarity index 100% rename from hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/ExcludePathAwareShallowETagFilterTest.java rename to hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/ExcludePathAwareShallowETagFilterTest.java diff --git a/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java similarity index 100% rename from hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java rename to hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java diff --git a/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java similarity index 100% rename from hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java rename to hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java diff --git a/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java similarity index 100% rename from hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java rename to hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java diff --git a/hawkbit-rest/pom.xml b/hawkbit-rest/pom.xml new file mode 100644 index 000000000..5837ce36f --- /dev/null +++ b/hawkbit-rest/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + org.eclipse.hawkbit + hawkbit-parent + ${revision} + + + hawkbit-rest + hawkBit :: REST :: Parent + pom + + + hawkbit-rest-api + hawkbit-rest-core + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 584ee604a..50d24da07 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,6 @@ 3.5.8 2025.0.0 2.8.14 - 4.0.0 @@ -272,11 +271,6 @@ - - org.springframework.plugin - spring-plugin-core - ${spring.plugin.core.version} - org.springdoc @@ -726,8 +720,8 @@ hawkbit-ql-jpa hawkbit-core hawkbit-artifact + hawkbit-rest hawkbit-repository - hawkbit-rest-core hawkbit-autoconfigure hawkbit-mgmt