From 56ff8168f9a5ef3f744337439138f6a2fd76575c Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Fri, 8 Nov 2024 17:40:27 +0200 Subject: [PATCH] Rename org.eclipse.hawkbit.api -> org.eclipse.hawkbit.artifact.repository.urlhandler (#1980) _release_notes_ Signed-off-by: Avgustin Marinov --- .../ArtifactUrlHandlerAutoConfiguration.java | 6 +++--- .../cache/CacheAutoConfiguration.java | 11 ++++------- .../repository/urlhandler}/ApiType.java | 2 +- .../repository/urlhandler}/ArtifactUrl.java | 2 +- .../urlhandler}/ArtifactUrlHandler.java | 2 +- .../ArtifactUrlHandlerProperties.java | 2 +- .../repository/urlhandler}/Base62Util.java | 10 +++++----- .../PropertyBasedArtifactUrlHandler.java | 17 ++++++++--------- .../repository/urlhandler}/URLPlaceholder.java | 8 +++----- .../repository/urlhandler}/Base62UtilTest.java | 2 +- .../PropertyBasedArtifactUrlHandlerTest.java | 12 +++++++++--- .../urlhandler}/URLPlaceholderTest.java | 3 ++- .../eclipse/hawkbit/amqp/AmqpConfiguration.java | 2 +- .../amqp/AmqpMessageDispatcherService.java | 10 +++++----- .../amqp/AmqpMessageDispatcherServiceTest.java | 4 ++-- .../repository/test/TestConfiguration.java | 4 ++-- .../ddi/rest/resource/DataConversionHelper.java | 8 ++++---- .../ddi/rest/resource/DdiRootController.java | 2 +- .../rest/resource/MgmtSoftwareModuleMapper.java | 8 ++++---- .../resource/MgmtSoftwareModuleResource.java | 2 +- 20 files changed, 59 insertions(+), 58 deletions(-) rename hawkbit-core/src/main/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/ApiType.java (90%) rename hawkbit-core/src/main/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/ArtifactUrl.java (93%) rename hawkbit-core/src/main/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/ArtifactUrlHandler.java (95%) rename hawkbit-core/src/main/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/ArtifactUrlHandlerProperties.java (97%) rename hawkbit-core/src/main/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/Base62Util.java (87%) rename hawkbit-core/src/main/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/PropertyBasedArtifactUrlHandler.java (95%) rename hawkbit-core/src/main/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/URLPlaceholder.java (92%) rename hawkbit-core/src/test/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/Base62UtilTest.java (95%) rename hawkbit-core/src/test/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/PropertyBasedArtifactUrlHandlerTest.java (93%) rename hawkbit-core/src/test/java/org/eclipse/hawkbit/{api => artifact/repository/urlhandler}/URLPlaceholderTest.java (96%) diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ArtifactUrlHandlerAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ArtifactUrlHandlerAutoConfiguration.java index e36f83339..36c731ba6 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ArtifactUrlHandlerAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ArtifactUrlHandlerAutoConfiguration.java @@ -9,9 +9,9 @@ */ package org.eclipse.hawkbit.autoconfigure; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; -import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties; -import org.eclipse.hawkbit.api.PropertyBasedArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandlerProperties; +import org.eclipse.hawkbit.artifact.repository.urlhandler.PropertyBasedArtifactUrlHandler; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java index f79b64229..e5a6c4986 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java @@ -24,20 +24,17 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; /** - * A configuration for configuring the spring {@link CacheManager} for specific - * multi-tenancy caching. The caches between tenants must not interfere each - * other. + * A configuration for configuring the spring {@link CacheManager} for specific multi-tenancy caching. The caches between + * tenants must not interfere each other. * - * This is done by providing a special {@link TenantCacheResolver} which - * generates a cache name included the current tenant. + * This is done by providing a special {@link TenancyCacheManager} which generates a cache name included the current tenant. */ @Configuration @EnableCaching public class CacheAutoConfiguration { /** - * @return the default cache manager bean if none other cache manager is - * existing. + * @return the default cache manager bean if none other cache manager is existing. */ @Bean @ConditionalOnMissingBean diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ApiType.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ApiType.java similarity index 90% rename from hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ApiType.java rename to hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ApiType.java index 233ef03d9..72983b6ef 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ApiType.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ApiType.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; /** * hawkBit API type. diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrl.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrl.java similarity index 93% rename from hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrl.java rename to hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrl.java index 2b5303444..8f10fa7ac 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrl.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrl.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import lombok.Data; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandler.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrlHandler.java similarity index 95% rename from hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandler.java rename to hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrlHandler.java index 156a91e7d..5f438b619 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandler.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrlHandler.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import java.net.URI; import java.util.List; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrlHandlerProperties.java similarity index 97% rename from hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java rename to hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrlHandlerProperties.java index 239359936..afc370abe 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/ArtifactUrlHandlerProperties.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import java.util.Arrays; import java.util.Collections; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/Base62Util.java similarity index 87% rename from hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java rename to hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/Base62Util.java index 4275ab9dd..bb31874f3 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/Base62Util.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -16,7 +16,7 @@ import lombok.NoArgsConstructor; * Utility class for Base10 to Base62 conversion and vice versa. Base62 has the benefit of being shorter in ASCII representation than Base10. */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public final class Base62Util { +final class Base62Util { private static final String BASE62_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; private static final int BASE62_BASE = BASE62_ALPHABET.length(); @@ -25,7 +25,7 @@ public final class Base62Util { * @param l number * @return converted number into Base62 ASCII string */ - public static String fromBase10(final long l) { + static String fromBase10(final long l) { if (l == 0) { return "0"; } @@ -43,11 +43,11 @@ public final class Base62Util { * @param base62 number * @return converted number into Base10 */ - public static Long toBase10(final String base62) { + static Long toBase10(final String base62) { return toBase10(new StringBuilder(base62).reverse().toString().toCharArray()); } - private static Long fromBase10(final long l, final StringBuilder sb) { + static Long fromBase10(final long l, final StringBuilder sb) { final int rem = (int) (l % BASE62_BASE); sb.append(BASE62_ALPHABET.charAt(rem)); return l / BASE62_BASE; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/PropertyBasedArtifactUrlHandler.java similarity index 95% rename from hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java rename to hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/PropertyBasedArtifactUrlHandler.java index e7b7f4359..5dbe229c7 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/PropertyBasedArtifactUrlHandler.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import java.net.URI; import java.net.URLEncoder; @@ -21,21 +21,20 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties.UrlProtocol; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandlerProperties.UrlProtocol; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; /** - * Implementation for ArtifactUrlHandler for creating urls to download resource - * based on patterns configured by {@link ArtifactUrlHandlerProperties}. + * Implementation for ArtifactUrlHandler for creating urls to download resource based on patterns configured by + * {@link ArtifactUrlHandlerProperties}. * - * This mechanism can be used to generate links to arbitrary file hosting - * infrastructure. However, the hawkBit update server supports hosting files as - * well in the following {@link UrlProtocol#getRef()} patterns: + * This mechanism can be used to generate links to arbitrary file hosting infrastructure. However, the hawkBit update server + * supports hosting files as well in the following {@link UrlProtocol#getRef()} patterns: * * Default: - * {protocol}://{hostname}:{port}{contextPath}/{tenant}/controller/v1/{controllerId}/ - * softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} + * {protocol}://{hostname}:{port}{contextPath}/{tenant}/controller/v1/{controllerId} + * /softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} * * Default (MD5SUM files): * {protocol}://{hostname}:{port}{contextPath}/{tenant}/controller/v1/{controllerId}/ diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/URLPlaceholder.java similarity index 92% rename from hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java rename to hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/URLPlaceholder.java index b56926423..d7545e1f6 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/urlhandler/URLPlaceholder.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import lombok.Data; @@ -30,8 +30,7 @@ public class URLPlaceholder { * @param tenantId of teh tenant * @param controllerId of the target * @param targetId of the target - * @param softwareData information about the artifact and software module that can be - * accessed by the URL. + * @param softwareData information about the artifact and software module that can be accessed by the URL. */ public URLPlaceholder(final String tenant, final Long tenantId, final String controllerId, final Long targetId, final SoftwareData softwareData) { @@ -62,8 +61,7 @@ public class URLPlaceholder { * @param artifactId of the artifact * @param sha1Hash of the artifact */ - public SoftwareData(final Long softwareModuleId, final String filename, final Long artifactId, - final String sha1Hash) { + public SoftwareData(final Long softwareModuleId, final String filename, final Long artifactId, final String sha1Hash) { this.softwareModuleId = softwareModuleId; this.filename = filename; this.artifactId = artifactId; diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/Base62UtilTest.java similarity index 95% rename from hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java rename to hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/Base62UtilTest.java index eff988944..ab6a28c50 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/Base62UtilTest.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import static org.assertj.core.api.Assertions.assertThat; diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/PropertyBasedArtifactUrlHandlerTest.java similarity index 93% rename from hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java rename to hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/PropertyBasedArtifactUrlHandlerTest.java index 26cdbe93c..0d190b734 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/PropertyBasedArtifactUrlHandlerTest.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import static org.assertj.core.api.Assertions.assertThat; @@ -18,8 +18,14 @@ import java.util.List; import io.qameta.allure.Description; import io.qameta.allure.Feature; import io.qameta.allure.Story; -import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties.UrlProtocol; -import org.eclipse.hawkbit.api.URLPlaceholder.SoftwareData; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ApiType; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrl; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandlerProperties; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandlerProperties.UrlProtocol; +import org.eclipse.hawkbit.artifact.repository.urlhandler.PropertyBasedArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder.SoftwareData; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/URLPlaceholderTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/URLPlaceholderTest.java similarity index 96% rename from hawkbit-core/src/test/java/org/eclipse/hawkbit/api/URLPlaceholderTest.java rename to hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/URLPlaceholderTest.java index 227539434..cf927736d 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/URLPlaceholderTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/artifact/repository/urlhandler/URLPlaceholderTest.java @@ -7,13 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.api; +package org.eclipse.hawkbit.artifact.repository.urlhandler; import static org.assertj.core.api.Assertions.assertThat; import io.qameta.allure.Description; import io.qameta.allure.Feature; import io.qameta.allure.Story; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder; import org.junit.jupiter.api.Test; @Feature("Unit Tests - Artifact URL Handler") diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java index 7ca749129..ccdfba273 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; import org.eclipse.hawkbit.dmf.amqp.api.AmqpSettings; import org.eclipse.hawkbit.repository.ConfirmationManagement; import org.eclipse.hawkbit.repository.ControllerManagement; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java index f7d59deeb..86f9c9833 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java @@ -28,11 +28,11 @@ import java.util.stream.StreamSupport; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.ListUtils; -import org.eclipse.hawkbit.api.ApiType; -import org.eclipse.hawkbit.api.ArtifactUrl; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; -import org.eclipse.hawkbit.api.URLPlaceholder; -import org.eclipse.hawkbit.api.URLPlaceholder.SoftwareData; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ApiType; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrl; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder.SoftwareData; import org.eclipse.hawkbit.dmf.amqp.api.EventTopic; import org.eclipse.hawkbit.dmf.amqp.api.MessageHeaderKey; import org.eclipse.hawkbit.dmf.amqp.api.MessageType; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java index cdb8a3143..c25cb0e0f 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java @@ -26,8 +26,8 @@ import java.util.UUID; import io.qameta.allure.Description; import io.qameta.allure.Feature; import io.qameta.allure.Story; -import org.eclipse.hawkbit.api.ArtifactUrl; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrl; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; import org.eclipse.hawkbit.artifact.repository.ArtifactFilesystem; import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact; import org.eclipse.hawkbit.artifact.repository.model.DbArtifactHash; diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java index f5735c140..178722422 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java @@ -18,8 +18,8 @@ import java.util.concurrent.atomic.AtomicLong; import org.eclipse.hawkbit.ContextAware; import org.eclipse.hawkbit.ControllerPollProperties; -import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties; -import org.eclipse.hawkbit.api.PropertyBasedArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandlerProperties; +import org.eclipse.hawkbit.artifact.repository.urlhandler.PropertyBasedArtifactUrlHandler; import org.eclipse.hawkbit.artifact.repository.ArtifactFilesystemProperties; import org.eclipse.hawkbit.artifact.repository.ArtifactFilesystemRepository; import org.eclipse.hawkbit.artifact.repository.ArtifactRepository; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java index d17f7a97d..0afd01193 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java @@ -13,10 +13,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.eclipse.hawkbit.api.ApiType; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; -import org.eclipse.hawkbit.api.URLPlaceholder; -import org.eclipse.hawkbit.api.URLPlaceholder.SoftwareData; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ApiType; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder.SoftwareData; import org.eclipse.hawkbit.ddi.json.model.DdiArtifact; import org.eclipse.hawkbit.ddi.json.model.DdiArtifactHash; import org.eclipse.hawkbit.ddi.json.model.DdiAutoConfirmationState; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java index 467380fcd..db1747938 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java @@ -22,7 +22,7 @@ import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.extern.slf4j.Slf4j; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; import org.eclipse.hawkbit.artifact.repository.model.DbArtifact; import org.eclipse.hawkbit.ddi.json.model.DdiActionFeedback; import org.eclipse.hawkbit.ddi.json.model.DdiActionHistory; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java index e86acd5f4..61fcc6b0f 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java @@ -19,10 +19,10 @@ import java.util.stream.Collectors; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.eclipse.hawkbit.api.ApiType; -import org.eclipse.hawkbit.api.ArtifactUrl; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; -import org.eclipse.hawkbit.api.URLPlaceholder; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ApiType; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrl; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.URLPlaceholder; import org.eclipse.hawkbit.mgmt.json.model.artifact.MgmtArtifact; import org.eclipse.hawkbit.mgmt.json.model.artifact.MgmtArtifactHash; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java index bd9e57255..fa66404b1 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java @@ -19,7 +19,7 @@ import java.util.Optional; import jakarta.validation.ValidationException; import lombok.extern.slf4j.Slf4j; -import org.eclipse.hawkbit.api.ArtifactUrlHandler; +import org.eclipse.hawkbit.artifact.repository.urlhandler.ArtifactUrlHandler; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.artifact.MgmtArtifact; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule;