Add DTO

src/main/java/net/geant/nmaas/portal/api/domain/DomainAnnotationView.java

+package net.geant.nmaas.portal.api.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class DomainAnnotationView {
+
+    private Long id;
+    private String key;
+    private String value;
+}
\ No newline at end of file

src/main/java/net/geant/nmaas/portal/api/market/DomainController.java

@@ -8,6 +8,7 @@ import net.geant.nmaas.dcn.deployment.entities.DcnDeploymentState;
 import net.geant.nmaas.orchestration.events.dcn.DcnDeployedEvent;
 import net.geant.nmaas.orchestration.events.dcn.DcnRemoveActionEvent;
 import net.geant.nmaas.orchestration.exceptions.InvalidDomainException;
+import net.geant.nmaas.portal.api.domain.DomainAnnotationView;
 import net.geant.nmaas.portal.api.domain.DomainBase;
 import net.geant.nmaas.portal.api.domain.DomainBaseWithState;
 import net.geant.nmaas.portal.api.domain.DomainGroupView;
@@ -245,7 +246,7 @@ public class DomainController extends AppBaseController {
 
 	@DeleteMapping("/group/{domainGroupId}")
 	@Transactional
-	@PreAuthorize("hasRole('ROLE_SYSTEM_ADMIN')")
+	@PreAuthorize("hasRole('ROLE_SYSTEM_ADMIN') || hasRole('ROLE_VL_MANAGER')")
 	public void deleteDomainGroup(@PathVariable Long domainGroupId) {
 		this.domainGroupService.deleteDomainGroup(domainGroupId);
 	}
@@ -287,7 +288,7 @@ public class DomainController extends AppBaseController {
 
 	@PatchMapping("/group/{domainGroupId}")
 	@Transactional
-	@PreAuthorize("hasRole('ROLE_SYSTEM_ADMIN')")
+	@PreAuthorize("hasRole('ROLE_SYSTEM_ADMIN') || hasRole('ROLE_VL_MANAGER')")
 	public DomainGroupView deleteDomainFromGroup(@PathVariable Long domainGroupId, @RequestBody Long domainId) {
 		return domainGroupService.deleteDomainFromGroup(
 				domainService.findDomain(domainId).orElseThrow(() -> new IllegalArgumentException(String.format("Domain with id %s doesn't exist", domainId))),
@@ -333,7 +334,7 @@ public class DomainController extends AppBaseController {
 	@PutMapping("/annotations/{id}")
 	@Transactional
 	@PreAuthorize("hasRole('ROLE_SYSTEM_ADMIN')")
-	public void updateAnnotation(@PathVariable Long id, @RequestBody DomainAnnotation annotation) {
+	public void updateAnnotation(@PathVariable Long id, @RequestBody DomainAnnotationView annotation) {
 		this.domainService.updateAnnotation(id, annotation);
 	}
 

src/main/java/net/geant/nmaas/portal/service/DomainService.java

@@ -2,6 +2,7 @@ package net.geant.nmaas.portal.service;
 
 import net.geant.nmaas.dcn.deployment.DcnDeploymentType;
 import net.geant.nmaas.dcn.deployment.entities.DcnInfo;
+import net.geant.nmaas.portal.api.domain.DomainAnnotationView;
 import net.geant.nmaas.portal.api.domain.DomainGroupView;
 import net.geant.nmaas.portal.api.domain.DomainRequest;
 import net.geant.nmaas.portal.api.domain.KeyValueView;
@@ -72,5 +73,5 @@ public interface DomainService {
 	boolean checkIfAnnotationExist(String key);
 	void deleteAnnotation(Long id);
 	List<DomainAnnotation> getAnnotations();
-	void updateAnnotation(Long id,DomainAnnotation domainAnnotation);
+	void updateAnnotation(Long id,DomainAnnotationView domainAnnotation);
 }
\ No newline at end of file

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

@@ -7,6 +7,7 @@ import net.geant.nmaas.dcn.deployment.entities.DcnInfo;
 import net.geant.nmaas.dcn.deployment.entities.DcnSpec;
 import net.geant.nmaas.dcn.deployment.repositories.DomainDcnDetailsRepository;
 import net.geant.nmaas.orchestration.repositories.DomainTechDetailsRepository;
+import net.geant.nmaas.portal.api.domain.DomainAnnotationView;
 import net.geant.nmaas.portal.api.domain.DomainGroupView;
 import net.geant.nmaas.portal.api.domain.DomainRequest;
 import net.geant.nmaas.portal.api.domain.KeyValueView;
@@ -521,12 +522,12 @@ public class DomainServiceImpl implements DomainService {
     }
 
     @Override
-    public void updateAnnotation(Long id, DomainAnnotation annotation) {
+    public void updateAnnotation(Long id, DomainAnnotationView annotation) {
         if (this.domainAnnotationsRepository.findById(id).isPresent() && id.equals(annotation.getId())) {
             DomainAnnotation domainAnnotation = this.domainAnnotationsRepository.findById(id).get();
             domainAnnotation.setKey(annotation.getKey());
             domainAnnotation.setValue(annotation.getValue());
-            this.domainAnnotationsRepository.save(annotation);
+            this.domainAnnotationsRepository.save(domainAnnotation);
         }
     }