Fixed some sonar issues

Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Sep 3, 2024 · 89b6d07 · 89b6d07
1 parent 47390ca
commit 89b6d07
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/...db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbHelper.java b/...db.h2db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbHelper.java
@@ -31,7 +31,9 @@ protected void setConfigurationService(ConfigurationService configurationService
     }
 
     protected void unsetConfigurationService(ConfigurationService configurationService) {
-        this.configurationService = null;
+        if (this.configurationService.equals(configurationService)) {
+            this.configurationService = null;
+        }
     }
 
     private void startDefaultDbServiceInstance() {

diff --git a/...db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImpl.java b/...db.provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceImpl.java
@@ -114,7 +114,9 @@ public void setCryptoService(CryptoService cryptoService) {
     }
 
     public void unsetCryptoService(CryptoService cryptoService) {
-        this.cryptoService = null;
+        if (this.cryptoService.equals(cryptoService)) {
+            this.cryptoService = null;
+        }
     }
 
     // ----------------------------------------------------------------

diff --git a/...provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceOptions.java b/...provider/src/main/java/org/eclipse/kura/internal/db/h2db/provider/H2DbServiceOptions.java
@@ -106,15 +106,7 @@ private void computeUrlParts() {
             }
         }
 
-        if ("mem".equals(protocol)) {
-            this.isInMemory = true;
-        } else if ("file".equals(protocol)) {
-            this.isFileBased = true;
-        } else if ("zip".equals(protocol)) {
-            this.isZipBased = true;
-        } else {
-            this.isRemote = true;
-        }
+        parseProtocol(protocol);
 
         this.baseUrl = "jdbc:h2:" + protocol + ':' + url;
 
@@ -130,6 +122,18 @@ private void computeUrlParts() {
         this.isFileBasedLogLevelSpecified = FILE_LOG_LEVEL_PATTERN.matcher(this.dbUrl).find();
     }
 
+    private void parseProtocol(String protocol) {
+        if ("mem".equals(protocol)) {
+            this.isInMemory = true;
+        } else if ("file".equals(protocol)) {
+            this.isFileBased = true;
+        } else if ("zip".equals(protocol)) {
+            this.isZipBased = true;
+        } else {
+            this.isRemote = true;
+        }
+    }
+
     public String getDbUrl() {
         return this.dbUrl;
     }