Merge branch 'develop' into 149-handle-namespace-creation-during-domain-provisioning

src/main/java/net/geant/nmaas/portal/service/impl/DomainServiceImpl.java

@@ -511,9 +511,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
@@ -523,8 +522,9 @@ public class DomainServiceImpl implements DomainService {
 
     @Override
     public void updateAnnotation(Long id, DomainAnnotationView 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(domainAnnotation);