From d388b8afdd2a31a44fd2b1aae0d6f557930eef24 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 3 Feb 2024 18:02:21 +0200 Subject: [PATCH] Refactoring/Improving source: artifactory-fs (#1606) Signed-off-by: Marinov Avgustin --- .../repository/ArtifactFilesystemProperties.java | 12 +++--------- .../repository/ArtifactFilesystemRepositoryTest.java | 7 +++---- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java index 31e3cbd39..e74cfe1cf 100644 --- a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java +++ b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java @@ -9,12 +9,14 @@ */ package org.eclipse.hawkbit.artifact.repository; +import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; /** * Configuration properties for the file-system repository, e.g. the base-path * to store the files. */ +@Data @ConfigurationProperties("org.eclipse.hawkbit.repository.file") public class ArtifactFilesystemProperties { @@ -22,12 +24,4 @@ public class ArtifactFilesystemProperties { * The base-path of the directory to store the artifacts. */ private String path = "./artifactrepo"; - - public String getPath() { - return path; - } - - public void setPath(final String path) { - this.path = path; - } -} +} \ No newline at end of file diff --git a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java index 616e22e4a..ea2f6f9df 100644 --- a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java +++ b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java @@ -17,6 +17,7 @@ import java.io.IOException; import java.nio.file.Files; import java.util.Random; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.assertj.core.api.Assertions; @@ -24,17 +25,15 @@ import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import io.qameta.allure.Description; import io.qameta.allure.Feature; import io.qameta.allure.Story; +@Slf4j @Feature("Unit Tests - Artifact File System Repository") @Story("Test storing artifact binaries in the file-system") public class ArtifactFilesystemRepositoryTest { - private static final Logger LOG = LoggerFactory.getLogger(ArtifactFilesystemRepositoryTest.class); private static final String TENANT = "test_tenant"; @@ -56,7 +55,7 @@ public class ArtifactFilesystemRepositoryTest { try { FileUtils.deleteDirectory(new File(artifactResourceProperties.getPath())); } catch (final IOException | IllegalArgumentException e) { - LOG.warn("Cannot delete file-directory", e); + log.warn("Cannot delete file-directory", e); } } }