From cc226eadac035cfccc07b62a0f21209bfb14fb1e Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Sat, 9 Nov 2024 15:11:39 +0200 Subject: [PATCH] Fix sonar findings: Type constants access (#1983) Signed-off-by: Avgustin Marinov --- .../builder/DistributionSetBuilder.java | 3 +-- .../builder/DistributionSetCreate.java | 5 +++-- .../builder/DistributionSetTypeBuilder.java | 3 +-- .../builder/DistributionSetTypeCreate.java | 16 ++++++++-------- .../builder/DistributionSetTypeUpdate.java | 5 +++-- .../builder/DistributionSetUpdate.java | 3 +-- .../repository/builder/SoftwareModuleCreate.java | 3 ++- .../builder/SoftwareModuleTypeCreate.java | 5 +++-- .../builder/SoftwareModuleTypeUpdate.java | 5 +++-- .../repository/builder/TargetTypeUpdate.java | 3 ++- .../eclipse/hawkbit/repository/model/Type.java | 9 +++------ .../jpa/management/TargetTypeManagementTest.java | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java index 576cdfc0e..b899d3a88 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java @@ -26,5 +26,4 @@ public interface DistributionSetBuilder { * @return builder instance */ DistributionSetCreate create(); - -} +} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java index afa1cb5c8..5921af37d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java @@ -20,6 +20,7 @@ import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.DistributionSetType; import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.NamedVersionedEntity; +import org.eclipse.hawkbit.repository.model.Type; /** * Builder to create a new {@link DistributionSet} entry. Defines all fields @@ -50,7 +51,7 @@ public interface DistributionSetCreate { * @param typeKey for {@link DistributionSet#getType()} * @return updated builder instance */ - DistributionSetCreate type(@Size(min = 1, max = DistributionSetType.KEY_MAX_SIZE) @NotNull String typeKey); + DistributionSetCreate type(@Size(min = 1, max = Type.KEY_MAX_SIZE) @NotNull String typeKey); /** * @param type for {@link DistributionSet#getType()} @@ -76,4 +77,4 @@ public interface DistributionSetCreate { * @return peek on current state of {@link DistributionSet} in the builder */ DistributionSet build(); -} +} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java index 9fec5c7ac..c9da57a20 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java @@ -26,5 +26,4 @@ public interface DistributionSetTypeBuilder { * @return builder instance */ DistributionSetTypeCreate create(); - -} +} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java index 938ac3e84..1de017e42 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java @@ -9,8 +9,8 @@ */ package org.eclipse.hawkbit.repository.builder; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Optional; import jakarta.validation.constraints.NotNull; @@ -20,6 +20,7 @@ import org.eclipse.hawkbit.repository.model.BaseEntity; import org.eclipse.hawkbit.repository.model.DistributionSetType; import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; +import org.eclipse.hawkbit.repository.model.Type; /** * Builder to create a new {@link DistributionSetType} entry. Defines all fields @@ -32,7 +33,7 @@ public interface DistributionSetTypeCreate { * @param key for {@link DistributionSetType#getKey()} * @return updated builder instance */ - DistributionSetTypeCreate key(@Size(min = 1, max = DistributionSetType.KEY_MAX_SIZE) @NotNull String key); + DistributionSetTypeCreate key(@Size(min = 1, max = Type.KEY_MAX_SIZE) @NotNull String key); /** * @param name for {@link DistributionSetType#getName()} @@ -50,7 +51,7 @@ public interface DistributionSetTypeCreate { * @param colour for {@link DistributionSetType#getColour()} * @return updated builder instance */ - DistributionSetTypeCreate colour(@Size(max = DistributionSetType.COLOUR_MAX_SIZE) String colour); + DistributionSetTypeCreate colour(@Size(max = Type.COLOUR_MAX_SIZE) String colour); /** * @param mandatory for {@link DistributionSetType#getMandatoryModuleTypes()} @@ -63,7 +64,7 @@ public interface DistributionSetTypeCreate { * @return updated builder instance */ default DistributionSetTypeCreate mandatory(final Long mandatory) { - return mandatory(Arrays.asList(mandatory)); + return mandatory(Collections.singletonList(mandatory)); } /** @@ -85,7 +86,7 @@ public interface DistributionSetTypeCreate { * @return updated builder instance */ default DistributionSetTypeCreate optional(final Long optional) { - return optional(Arrays.asList(optional)); + return optional(Collections.singletonList(optional)); } /** @@ -97,8 +98,7 @@ public interface DistributionSetTypeCreate { } /** - * @return peek on current state of {@link DistributionSetType} in the - * builder + * @return peek on current state of {@link DistributionSetType} in the builder */ DistributionSetType build(); -} +} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java index 271bd9eef..c5e703e7b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java @@ -15,6 +15,7 @@ import jakarta.validation.constraints.Size; import org.eclipse.hawkbit.repository.model.DistributionSetType; import org.eclipse.hawkbit.repository.model.NamedEntity; +import org.eclipse.hawkbit.repository.model.Type; /** * Builder to update an existing {@link DistributionSetType} entry. Defines all @@ -32,7 +33,7 @@ public interface DistributionSetTypeUpdate { * @param colour for {@link DistributionSetType#getColour()} * @return updated builder instance */ - DistributionSetTypeUpdate colour(@Size(max = DistributionSetType.COLOUR_MAX_SIZE) String colour); + DistributionSetTypeUpdate colour(@Size(max = Type.COLOUR_MAX_SIZE) String colour); /** * @param mandatory for {@link DistributionSetType#getMandatoryModuleTypes()} @@ -45,4 +46,4 @@ public interface DistributionSetTypeUpdate { * @return updated builder instance */ DistributionSetTypeUpdate optional(Collection optional); -} +} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java index 0d34c669a..83edb84b7 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java @@ -18,8 +18,7 @@ import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.NamedVersionedEntity; /** - * Builder to update an existing {@link DistributionSet} entry. Defines all - * fields that can be updated. + * Builder to update an existing {@link DistributionSet} entry. Defines all fields that can be updated. */ public interface DistributionSetUpdate { diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java index 15c224e93..b4df96f76 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java @@ -19,6 +19,7 @@ import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.NamedVersionedEntity; import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; +import org.eclipse.hawkbit.repository.model.Type; /** * Builder to create a new {@link SoftwareModule} entry. Defines all fields that @@ -55,7 +56,7 @@ public interface SoftwareModuleCreate { * @param typeKey for {@link SoftwareModule#getType()} * @return updated builder instance */ - SoftwareModuleCreate type(@Size(min = 1, max = SoftwareModuleType.KEY_MAX_SIZE) @NotNull String typeKey); + SoftwareModuleCreate type(@Size(min = 1, max = Type.KEY_MAX_SIZE) @NotNull String typeKey); /** * @param type for {@link SoftwareModule#getType()} diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java index a3207bcb4..fadafa89e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java @@ -15,6 +15,7 @@ import jakarta.validation.constraints.Size; import org.eclipse.hawkbit.repository.model.BaseEntity; import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; +import org.eclipse.hawkbit.repository.model.Type; /** * Builder to create a new {@link SoftwareModuleType} entry. Defines all fields @@ -27,7 +28,7 @@ public interface SoftwareModuleTypeCreate { * @param key for {@link SoftwareModuleType#getKey()} * @return updated builder instance */ - SoftwareModuleTypeCreate key(@Size(min = 1, max = SoftwareModuleType.KEY_MAX_SIZE) @NotNull String key); + SoftwareModuleTypeCreate key(@Size(min = 1, max = Type.KEY_MAX_SIZE) @NotNull String key); /** * @param name for {@link SoftwareModuleType#getName()} @@ -45,7 +46,7 @@ public interface SoftwareModuleTypeCreate { * @param colour for {@link SoftwareModuleType#getColour()} * @return updated builder instance */ - SoftwareModuleTypeCreate colour(@Size(max = SoftwareModuleType.COLOUR_MAX_SIZE) String colour); + SoftwareModuleTypeCreate colour(@Size(max = Type.COLOUR_MAX_SIZE) String colour); /** * @param maxAssignments for {@link SoftwareModuleType#getMaxAssignments()} diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java index 50f216856..1ccf7b7bd 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java @@ -13,6 +13,7 @@ import jakarta.validation.constraints.Size; import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.SoftwareModuleType; +import org.eclipse.hawkbit.repository.model.Type; /** * Builder to update an existing {@link SoftwareModuleType} entry. Defines all @@ -30,5 +31,5 @@ public interface SoftwareModuleTypeUpdate { * @param colour for {@link SoftwareModuleType#getColour()} * @return updated builder instance */ - SoftwareModuleTypeUpdate colour(@Size(max = SoftwareModuleType.COLOUR_MAX_SIZE) String colour); -} + SoftwareModuleTypeUpdate colour(@Size(max = Type.COLOUR_MAX_SIZE) String colour); +} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java index 556233bb3..fbaaaf51f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java @@ -13,6 +13,7 @@ import jakarta.validation.constraints.Size; import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.TargetType; +import org.eclipse.hawkbit.repository.model.Type; /** * Builder to update an existing {@link TargetType} entry. Defines all @@ -30,7 +31,7 @@ public interface TargetTypeUpdate { * @param colour for {@link TargetType#getColour()} * @return updated builder instance */ - TargetTypeUpdate colour(@Size(max = TargetType.COLOUR_MAX_SIZE) String colour); + TargetTypeUpdate colour(@Size(max = Type.COLOUR_MAX_SIZE) String colour); /** * @param name Name diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java index 5da75f454..d5ceb446c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java @@ -10,8 +10,7 @@ package org.eclipse.hawkbit.repository.model; /** - * {@link Type} is an abstract definition for {@link DistributionSetType}s and - * {@link SoftwareModuleType}s + * {@link Type} is an abstract definition for {@link DistributionSetType}s and {@link SoftwareModuleType}s */ public interface Type extends NamedEntity { @@ -31,8 +30,7 @@ public interface Type extends NamedEntity { String getKey(); /** - * @return true if the type is deleted and only kept for - * history purposes. + * @return true if the type is deleted and only kept for history purposes. */ boolean isDeleted(); @@ -40,5 +38,4 @@ public interface Type extends NamedEntity { * @return get color code to be used in management UI views. */ String getColour(); - -} +} \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTypeManagementTest.java index e2f3bd7a2..9dff10bc3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTypeManagementTest.java @@ -214,7 +214,7 @@ class TargetTypeManagementTest extends AbstractJpaIntegrationTest { .as("targetType with too long colour should not be created") .isThrownBy(() -> targetTypeManagement.create( entityFactory.targetType().create().name("a") - .colour(RandomStringUtils.randomAlphanumeric(TargetType.COLOUR_MAX_SIZE + 1)))); + .colour(RandomStringUtils.randomAlphanumeric(Type.COLOUR_MAX_SIZE + 1)))); assertThatExceptionOfType(ConstraintViolationException.class) .as("targetType with invalid colour should not be created").isThrownBy(() -> targetTypeManagement @@ -224,7 +224,7 @@ class TargetTypeManagementTest extends AbstractJpaIntegrationTest { .as("targetType with too long colour should not be updated") .isThrownBy(() -> targetTypeManagement.update( entityFactory.targetType().update(targetType.getId()) - .colour(RandomStringUtils.randomAlphanumeric(TargetType.COLOUR_MAX_SIZE + 1)))); + .colour(RandomStringUtils.randomAlphanumeric(Type.COLOUR_MAX_SIZE + 1)))); assertThatExceptionOfType(ConstraintViolationException.class) .as("targetType with invalid colour should not be updated").isThrownBy(() -> targetTypeManagement