From 46650b0f8ff00e1ad0d7da5c9de3faf9b2d6649b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=C5=81opatowski?=
<lukasz.lopatowski@gmail.com>
Date: Wed, 13 Mar 2024 12:11:53 +0100
Subject: [PATCH] Sonar fixes
---
.../nmaas/portal/service/impl/DomainServiceImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/geant/nmaas/portal/service/impl/DomainServiceImpl.java b/src/main/java/net/geant/nmaas/portal/service/impl/DomainServiceImpl.java
index 1bc1b8fc4..e8ad91d3b 100644
--- a/src/main/java/net/geant/nmaas/portal/service/impl/DomainServiceImpl.java
+++ b/src/main/java/net/geant/nmaas/portal/service/impl/DomainServiceImpl.java
@@ -510,9 +510,8 @@ public class DomainServiceImpl implements DomainService {
@Override
public void deleteAnnotation(Long id) {
- if(this.domainAnnotationsRepository.findById(id).isPresent()){
- this.domainAnnotationsRepository.delete(this.domainAnnotationsRepository.findById(id).get());
- }
+ Optional<DomainAnnotation> domainFromDb = this.domainAnnotationsRepository.findById(id);
+ domainFromDb.ifPresent(this.domainAnnotationsRepository::delete);
}
@Override
@@ -522,8 +521,9 @@ public class DomainServiceImpl implements DomainService {
@Override
public void updateAnnotation(Long id, DomainAnnotation annotation) {
- if (this.domainAnnotationsRepository.findById(id).isPresent() && id.equals(annotation.getId())) {
- DomainAnnotation domainAnnotation = this.domainAnnotationsRepository.findById(id).get();
+ Optional<DomainAnnotation> domainFromDb = this.domainAnnotationsRepository.findById(id);
+ if (domainFromDb.isPresent() && id.equals(annotation.getId())) {
+ DomainAnnotation domainAnnotation = domainFromDb.get();
domainAnnotation.setKey(annotation.getKey());
domainAnnotation.setValue(annotation.getValue());
this.domainAnnotationsRepository.save(annotation);
--
GitLab