diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/DistributedResourceBundleMessageSource.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/DistributedResourceBundleMessageSource.java index ded9f8f13..9066abf2d 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/DistributedResourceBundleMessageSource.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/DistributedResourceBundleMessageSource.java @@ -12,8 +12,7 @@ package org.eclipse.hawkbit; import java.io.IOException; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; @@ -24,11 +23,9 @@ import org.springframework.core.io.support.ResourcePatternResolver; * MessageSource implementation supports more than 1 properties file with the * same name. All properties files will be merged. */ +@Slf4j public class DistributedResourceBundleMessageSource extends ReloadableResourceBundleMessageSource { - // Exception squid:S2387 - Follows our upper case convention - @SuppressWarnings({ "squid:S2387" }) - private static final Logger LOGGER = LoggerFactory.getLogger(DistributedResourceBundleMessageSource.class); private static final String PROPERTIES_SUFFIX = ".properties"; private ResourceLoader resourceLoader; @@ -47,7 +44,7 @@ public class DistributedResourceBundleMessageSource extends ReloadableResourceBu final Properties properties = new Properties(); long lastModified = -1; if (!(resourceLoader instanceof ResourcePatternResolver)) { - LOGGER.warn( + log.warn( "Resource Loader {} doesn't support getting multiple resources. Default properties mechanism will used", resourceLoader.getClass().getName()); return super.refreshProperties(filename, propHolder); @@ -65,7 +62,7 @@ public class DistributedResourceBundleMessageSource extends ReloadableResourceBu } } } catch (final IOException ignored) { - LOGGER.warn("Resource with filename " + filename + " couldn't load", ignored); + log.warn("Resource with filename " + filename + " couldn't load", ignored); } return new PropertiesHolder(properties, lastModified); } @@ -75,5 +72,4 @@ public class DistributedResourceBundleMessageSource extends ReloadableResourceBu this.resourceLoader = resourceLoader; super.setResourceLoader(resourceLoader); } - -} +} \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ApiType.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ApiType.java index 91829a3fd..233ef03d9 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ApiType.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ApiType.java @@ -11,7 +11,6 @@ package org.eclipse.hawkbit.api; /** * hawkBit API type. - * */ public enum ApiType { @@ -29,4 +28,4 @@ public enum ApiType { * Support for Management API. */ MGMT -} +} \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java index 2ca104cbf..5a673ddcd 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java @@ -88,4 +88,4 @@ public class ArtifactUrlHandlerProperties { this.supports = Collections.unmodifiableList(supports); } } -} +} \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java index 18eee9343..5f2433519 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java @@ -9,18 +9,18 @@ */ package org.eclipse.hawkbit.api; +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 public final class Base62Util { + private static final String BASE62_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; private static final int BASE62_BASE = BASE62_ALPHABET.length(); - private Base62Util() { - // Utility class - } - /** * @param base10 * number @@ -66,4 +66,4 @@ public final class Base62Util { private static int toBase10(final int n, final int pow) { return n * (int) Math.pow(BASE62_BASE, pow); } -} +} \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java index 7ff89f350..05c0fdcc2 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java @@ -19,10 +19,9 @@ import java.net.URL; public interface HostnameResolver { /** + * Resolved the hostname * - * - * @return + * @return resolved hostname as URL */ URL resolveHostname(); - -} +} \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java index 3f152dc35..1119e11b7 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java @@ -14,6 +14,7 @@ package org.eclipse.hawkbit.api; * pattern. */ public interface ProtocolProperties { + /** * @return the hostname value to resolve in the pattern. */ @@ -38,4 +39,4 @@ public interface ProtocolProperties { * @return true if the {@link ProtocolProperties} is enabled. */ boolean isEnabled(); -} +} \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java index 56ad590bb..d6fe0c319 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java @@ -81,4 +81,4 @@ public class URLPlaceholder { this.sha1Hash = sha1Hash; } } -} +} \ No newline at end of file diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java index 099ee6ad6..e171b250d 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java @@ -25,8 +25,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.eclipse.hawkbit.artifact.repository.model.AbstractDbArtifact; import org.eclipse.hawkbit.artifact.repository.model.DbArtifactHash; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.util.StringUtils; /** diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java index 6f13d9213..59d9e0272 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java @@ -33,4 +33,4 @@ public class DbArtifactHash { this.md5 = md5; this.sha256 = sha256; } -} +} \ No newline at end of file diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java index 91fefbce0..9910c9769 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java @@ -124,4 +124,4 @@ class DefaultDownloadIdCacheTest { assertThat(cacheManagerKeyCaptor.getValue()).isEqualTo(knownKey); assertThat(cacheManagerValueCaptor.getValue()).isEqualTo(value); } -} +} \ No newline at end of file