From ad3404c93d7333636ea97fe6e2e7a9d22f165430 Mon Sep 17 00:00:00 2001 From: Marinov Avgustin Date: Fri, 30 Jun 2023 09:29:05 +0300 Subject: [PATCH] Fix some sonar findings Signed-off-by: Marinov Avgustin --- .../jpa/model/JpaAutoConfirmationStatus.java | 11 ++++++++--- ...ontrollerPreAuthenticatedSecurityHeaderFilter.java | 1 + .../hawkbit/ui/artifacts/ArtifactUploadState.java | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java index dac0feceb..c88ca3ad9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java @@ -77,9 +77,14 @@ public class JpaAutoConfirmationStatus extends AbstractJpaTenantAwareBaseEntity final String remarkMessage = StringUtils.hasText(remark) ? remark : "n/a"; final String formattedInitiator = StringUtils.hasText(initiator) ? initiator : "n/a"; final String createdByRolloutsUser = StringUtils.hasText(getCreatedBy()) ? getCreatedBy() : "n/a"; - return String.format("Assignment automatically confirmed by initiator '%s'. \n\n" // - + "Auto confirmation activated by system user: '%s' \n\n" // - + "Remark: %s", formattedInitiator, createdByRolloutsUser, remarkMessage); + // https://docs.oracle.com/en/java/javase/17/text-blocks/index.html#normalization-of-line-terminators + // nevertheless of the end of line of the file (\r\n, \n or \r) the result will contains \n + return """ + Assignment automatically confirmed by initiator '%s'.\040 + + Auto confirmation activated by system user: '%s'\040 + + Remark: %s""".formatted(formattedInitiator, createdByRolloutsUser, remarkMessage); } @Override diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java index 95fda0a11..0a986eb08 100644 --- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java +++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java @@ -118,6 +118,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilter extends AbstractCont * if we find the hash in any the trusted CA chain to accept this request for * this tenant. */ + @SuppressWarnings("java:S2629") // check if debug is enabled is maybe heavier then evaluation private String getIssuerHashHeader(final DmfTenantSecurityToken securityToken, final String knownIssuerHashes) { // there may be several knownIssuerHashes configured for the tenant final List knownHashes = splitMultiHashBySemicolon(knownIssuerHashes); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java index e1663ffd9..52fc630ca 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java @@ -227,6 +227,7 @@ public class ArtifactUploadState implements Serializable { return inProgressCount; } + @SuppressWarnings("java:S2629") // error shall be enable almost every time and evaluation is light private static void assertFileStateConsistency(final int inProgressCount, final int overallUploadCount, final int succeededUploadCount, final int failedUploadCount) { if (inProgressCount < 0) {