From 0d40837f9b903e2f47f85157eab5ad951c59a219 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Wed, 13 Nov 2024 09:53:17 +0200
Subject: [PATCH] Fix sonar finding for string duplications (#2023)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 .../jpa/management/JpaArtifactManagement.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaArtifactManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaArtifactManagement.java
index de9659447..61fd33dfd 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaArtifactManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaArtifactManagement.java
@@ -11,7 +11,6 @@ package org.eclipse.hawkbit.repository.jpa.management;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Objects;
 import java.util.Optional;
 
 import jakarta.annotation.Nullable;
@@ -105,9 +104,7 @@ public class JpaArtifactManagement implements ArtifactManagement {
     @Retryable(include = {
             ConcurrencyFailureException.class }, maxAttempts = Constants.TX_RT_MAX, backoff = @Backoff(delay = Constants.TX_RT_DELAY))
     public Artifact create(final ArtifactUpload artifactUpload) {
-        if (artifactRepository == null) {
-            throw new UnsupportedOperationException("ArtifactRepository is unavailable");
-        }
+        assertArtifactRepositoryAvailable();
 
         final long moduleId = artifactUpload.getModuleId();
         assertArtifactQuota(moduleId, 1);
@@ -198,9 +195,7 @@ public class JpaArtifactManagement implements ArtifactManagement {
 
     @Override
     public Optional<DbArtifact> loadArtifactBinary(final String sha1Hash, final long softwareModuleId, final boolean isEncrypted) {
-        if (artifactRepository == null) {
-            throw new UnsupportedOperationException("ArtifactRepository is unavailable");
-        }
+        assertArtifactRepositoryAvailable();
 
         assertSoftwareModuleExists(softwareModuleId);
 
@@ -230,9 +225,7 @@ public class JpaArtifactManagement implements ArtifactManagement {
      */
     @PreAuthorize(SpPermission.SpringEvalExpressions.HAS_AUTH_DELETE_REPOSITORY)
     void clearArtifactBinary(final String sha1Hash) {
-        if (artifactRepository == null) {
-            throw new UnsupportedOperationException("ArtifactRepository is unavailable");
-        }
+        assertArtifactRepositoryAvailable();
 
         // countBySha1HashAndTenantAndSoftwareModuleDeletedIsFalse will skip ACM checks and
         // will return total count as it should be
@@ -339,4 +332,10 @@ public class JpaArtifactManagement implements ArtifactManagement {
             throw new EntityNotFoundException(SoftwareModule.class, softwareModuleId);
         }
     }
+
+    private void assertArtifactRepositoryAvailable() {
+        if (artifactRepository == null) {
+            throw new UnsupportedOperationException("ArtifactRepository is unavailable");
+        }
+    }
 }
\ No newline at end of file