From 198360e29cd027a45cbeb468ce96c1d643f720bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 19 Oct 2021 11:22:18 +0200
Subject: [PATCH 01/18] bump version (#3011)

---
 package-lock.json                        | 2 +-
 package.json                             | 2 +-
 pom.xml                                  | 2 +-
 src/main/webapp/scripts/app.constants.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index edcedbf2a8..d8e32c7d02 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Metadatamanagement",
-  "version": "1.0.115",
+  "version": "1.0.116-SNAPSHOT",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7ad2aaeb0a..35aaa41948 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Metadatamanagement",
-  "version": "1.0.115",
+  "version": "1.0.116-SNAPSHOT",
   "description": "Data Search for Higher Education Research and Science Studies",
   "private": true,
   "dependencies": {
diff --git a/pom.xml b/pom.xml
index 529f250939..675bc758f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>eu.dzhw.fdz</groupId>
     <artifactId>metadatamanagement</artifactId>
-    <version>1.0.115</version>
+    <version>1.0.116-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>metadatamanagement</name>
 
diff --git a/src/main/webapp/scripts/app.constants.js b/src/main/webapp/scripts/app.constants.js
index f4b6674f6d..bc8600e55b 100644
--- a/src/main/webapp/scripts/app.constants.js
+++ b/src/main/webapp/scripts/app.constants.js
@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
 
 .constant('ENV', 'local')
 
-.constant('VERSION', '1.0.115')
+.constant('VERSION', '1.0.116-SNAPSHOT')
 
 .constant('ElasticSearchProperties', {apiVersion:'7.x',logLevel:'error',pageSize:10})
 

From 8c8f464d5ce3fc25abb8b77ad61c0d5d3f39fde0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 19 Oct 2021 14:14:00 +0200
Subject: [PATCH 02/18] refine readme after freelancer setup

---
 README.md | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 8721f8c743..9d672234b0 100644
--- a/README.md
+++ b/README.md
@@ -31,10 +31,8 @@ On Windows, `patch.exe` has to exist in the PATH. It is distributed as part of g
 ## Running on your local machine
 
 Before starting the app on your local machine you need to start the following Document Stores:
-1. Mongodb: Mongodb must be running on the default port, on ubuntu you should install it from [here](https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/)
-2. Elasticsearch (7.12.1): Elasticsearch must be running on its default port. You can download it from [here](https://www.elastic.co/downloads/elasticsearch)
-
-Make sure that you have read-write-access on the ***data*** directory (in your project directory) for Elasticsearch.
+1. Mongodb: Mongodb must be running on the default port, on ubuntu you should install it from [here](https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/). ***However, running it with docker is preferred.***
+2. Elasticsearch (7.12.1): Elasticsearch must be running on its default port. You can download it from [here](https://www.elastic.co/downloads/elasticsearch). ***However running it with docker is preferred.***
 
 ***Alternatively*** you can run
 
@@ -42,7 +40,16 @@ Make sure that you have read-write-access on the ***data*** directory (in your p
     # for later use once the containers are created
     docker-compose start
 
-to start all services the metadatamanagement depends on. Mongodb and Elasticsearch will be listening on its default ports.
+to start all services the metadatamanagement depends on. MongoDB and Elasticsearch will be listening on its default ports.
+
+Make sure that you have read-write-access on the ***data*** directory (in your project directory) for Elasticsearch.
+
+You can get a MongoDB dump and restore it locally:
+```
+wget https://metadatamanagement-public.s3.eu-central-1.amazonaws.com/20211019_metadatamanagement.zip
+unzip 20211019_metadatamanagement.zip
+mongorestore ./metadatamanagement --db=metadatamanagement
+```
 
 You will need to setup your `~/.m2/settings.xml` so that maven can download a dependency from Github:
 
@@ -71,6 +78,15 @@ auto-refreshes when files change on your hard drive.
     mvn
     grunt
 
+If you run the backend on your machine for the first time or you have restored a mongodb dump then you need to setup the elasticsearch indices. Therefore go to http://localhost:8080/de/health and sign in with `localuser` and password `herlichwillkommen`. Then click the red button 'reindex'. Reindexing can take up to 1 hour.
+
+In order for all external services to work on your local machine, you need to set the following environment variables:
+```
+DARA_ENDPOINT=http://labs.da-ra.de/dara/
+DARA_USERNAME={see s3://metadatamanagement-private/sensitive_variables.tf}
+DARA_PASSWORD={see s3://metadatamanagement-private/sensitive_variables.tf}
+```
+
 If you want to build a docker image for the metadatamanagement server app you can run
 
     mvn deploy
@@ -90,23 +106,6 @@ these new files.
 
 We test our project continuously with the Robot Framework. Test Developers can get further info [here](https://github.com/dzhw/metadatamanagement/wiki/Robot-Framework).
 
-## Technical Documentation
-
-### Domain Model
-The following picture models the relationships and attributes of the domain objects which are managed by our system.
-![Domain Model](https://github.com/dzhw/metadatamanagement/wiki/images/domain-model.png)
-
-Javadoc for our domain model can be found [here](https://dzhw.github.io/metadatamanagement/).
-
-### Architecture
-
-A (german) overview of the Systemarchitecture can be found [here](https://github.com/dzhw/metadatamanagement/wiki/Architektur).
-
-The following picture gives a rough overview:
-![Architecture](https://github.com/dzhw/metadatamanagement/wiki/images/architecture/aws_components_overview.png)
-
-This project is currently built and deployed to AWS Fargate by [Github Actions][GithubActions] (not TravisCI anymore as shown in the picture above). You can test the latest version on [our dev stage.](https://dev.metadata.fdz.dzhw.eu/)
-
 # Big Thanks
 
 Cross-browser Testing Platform and Open Source :heart: Provided by [Sauce Labs][saucelabs]

From 882c467beccebda839a96a8170238da95e60cb77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 19 Oct 2021 14:22:55 +0200
Subject: [PATCH 03/18] add maildev and identity provider

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9d672234b0..512f5ce38c 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Before starting the app on your local machine you need to start the following Do
     # for later use once the containers are created
     docker-compose start
 
-to start all services the metadatamanagement depends on. MongoDB and Elasticsearch will be listening on its default ports.
+to start all services the metadatamanagement depends on. MongoDB and Elasticsearch will be listening on its default ports. MailDev will show all locally sent email on 8081 and the identity-provider can be setup on port 8082.
 
 Make sure that you have read-write-access on the ***data*** directory (in your project directory) for Elasticsearch.
 

From a19dc581bf3a6a973bae82cdd64577f9510a9500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 21 Oct 2021 12:27:39 +0200
Subject: [PATCH 04/18] add automatic deletion for script attachments, index
 tags (#2978)

---
 .../domain/Script.java                        |  2 +-
 .../AnalysisPackageChangesProvider.java       | 37 ++++++-
 .../service/ScriptAttachmentService.java      | 36 ++++++-
 .../analysis_packages/mapping.json            | 29 ++++++
 .../elasticsearch/indices_version.json        |  2 +-
 .../rest/ScriptAttachmentResourceTest.java    | 99 +++++++++++++++++++
 6 files changed, 201 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/Script.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/Script.java
index 288855c628..f79f3051ed 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/Script.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/Script.java
@@ -39,7 +39,7 @@ public class Script implements Serializable {
    * Client side generated id of the script. Used to reference script attachments. Not unique in the
    * DB cause shadow copies of {@link AnalysisPackage}s do not changes this id.
    * 
-   * Must not be empty.
+   * Must not be empty and must be unique within the {@link AnalysisPackage}.
    */
   @NotEmpty(message = "analysis-package-management.error.script.uuid.not-empty")
   private String uuid;
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/AnalysisPackageChangesProvider.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/AnalysisPackageChangesProvider.java
index 88cba0adf5..38911edff9 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/AnalysisPackageChangesProvider.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/AnalysisPackageChangesProvider.java
@@ -1,14 +1,19 @@
 package eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.AnalysisPackage;
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.Script;
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.ScriptAttachmentMetadata;
 import eu.dzhw.fdz.metadatamanagement.common.service.DomainObjectChangesProvider;
 
 /**
  * Remember the previous version of a analysis package per request in order to update elasticsearch
- * correctly.
+ * correctly or in order to delete {@link ScriptAttachmentMetadata}.
  * 
  * @author René Reitmann
  */
@@ -16,4 +21,34 @@
 @RequestScope
 public class AnalysisPackageChangesProvider extends DomainObjectChangesProvider<AnalysisPackage> {
 
+  /**
+   * Return a list of all {@link Script}s which have been removed from the given 
+   * {@link AnalysisPackage}.
+   * 
+   * @param analysisPackageId The id of the {@link AnalysisPackage}
+   * @return list of deleted {@link Script}s
+   */
+  public List<Script> getDeletedScripts(String analysisPackageId) {
+    if (oldDomainObjects.get(analysisPackageId) == null
+        || oldDomainObjects.get(analysisPackageId).getScripts() == null) {
+      return new ArrayList<>();
+    }
+    if (newDomainObjects.get(analysisPackageId) == null
+        || newDomainObjects.get(analysisPackageId).getScripts() == null) {
+      return oldDomainObjects.get(analysisPackageId).getScripts();
+    }
+    List<Script> deletedScripts =
+        new ArrayList<>(oldDomainObjects.get(analysisPackageId).getScripts());
+    List<Script> newScripts = newDomainObjects.get(analysisPackageId).getScripts();
+    // check if deleted script is really deleted else remove it
+    for (Script script : newScripts) {
+      Script notDeletedScript = deletedScripts.stream()
+          .filter(deletedScript -> deletedScript.getUuid().equals(script.getUuid())).findAny()
+          .orElse(null);
+      if (notDeletedScript != null) {
+        deletedScripts.remove(notDeletedScript);
+      }
+    }
+    return deletedScripts;
+  }
 }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/ScriptAttachmentService.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/ScriptAttachmentService.java
index 9367c47da6..aafec1a59b 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/ScriptAttachmentService.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/service/ScriptAttachmentService.java
@@ -10,6 +10,8 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.gridfs.GridFsCriteria;
 import org.springframework.data.mongodb.gridfs.GridFsOperations;
+import org.springframework.data.rest.core.annotation.HandleAfterSave;
+import org.springframework.data.rest.core.annotation.RepositoryEventHandler;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -31,6 +33,7 @@
  */
 @Service
 @RequiredArgsConstructor
+@RepositoryEventHandler
 public class ScriptAttachmentService {
   private final GridFsOperations operations;
 
@@ -40,6 +43,21 @@ public class ScriptAttachmentService {
 
   private final AttachmentMetadataHelper<ScriptAttachmentMetadata> attachmentMetadataHelper;
 
+  private final AnalysisPackageChangesProvider analysisPackageChangesProvider;
+
+  /**
+   * Delete all {@link Script} attachments when the {@link Script} is removed from the given
+   * {@link AnalysisPackage}.
+   * 
+   * @param analysisPackage The changed analysis package
+   */
+  @HandleAfterSave
+  public void onAnalysisPackageChanged(AnalysisPackage analysisPackage) {
+    analysisPackageChangesProvider.getDeletedScripts(analysisPackage.getId())
+        .forEach(script -> deleteByAnalysisPackageIdAndScriptUuid(analysisPackage.getId(),
+            script.getUuid()));
+  }
+
   /**
    * Save the attachment for a {@link Script}.
    *
@@ -82,9 +100,25 @@ public void updateAttachmentMetadata(ScriptAttachmentMetadata metadata) {
    * @param analysisPackageId the id of the analysis package.
    */
   public void deleteAllByAnalysisPackageId(String analysisPackageId) {
-    String currentUser = SecurityUtils.getCurrentUserLogin();
     Query query = new Query(GridFsCriteria.whereFilename().regex("^"
         + Pattern.quote(ScriptAttachmentFilenameBuilder.buildFileNamePrefix(analysisPackageId))));
+    deleteByQuery(query);
+  }
+
+  /**
+   * Delete the given script attachments of the given {@link AnalysisPackage}.
+   *
+   * @param analysisPackageId the id of the analysis package.
+   * @param scriptUuid the id of the {@link Script}.
+   */
+  public void deleteByAnalysisPackageIdAndScriptUuid(String analysisPackageId, String scriptUuid) {
+    Query query = new Query(GridFsCriteria.whereFilename().regex("^" + Pattern.quote(
+        ScriptAttachmentFilenameBuilder.buildFileNamePrefix(analysisPackageId, scriptUuid))));
+    deleteByQuery(query);
+  }
+
+  private void deleteByQuery(Query query) {
+    String currentUser = SecurityUtils.getCurrentUserLogin();
     Iterable<GridFSFile> files = this.operations.find(query);
     files.forEach(file -> {
       ScriptAttachmentMetadata metadata =
diff --git a/src/main/resources/elasticsearch/analysis_packages/mapping.json b/src/main/resources/elasticsearch/analysis_packages/mapping.json
index 159167dc29..5acc72e412 100644
--- a/src/main/resources/elasticsearch/analysis_packages/mapping.json
+++ b/src/main/resources/elasticsearch/analysis_packages/mapping.json
@@ -175,6 +175,35 @@
 				}
 			}
 		},
+		"tags": {
+			"type": "object",
+			"properties": {
+				"de": {
+					"type": "keyword",
+					"norms": false,
+					"copy_to": "all",
+					"fields": {
+						"ngrams": {
+							"type": "text",
+							"analyzer": "ngrams",
+							"norms": false
+						}
+					}
+				},
+				"en": {
+					"type": "keyword",
+					"norms": false,
+					"copy_to": "all",
+					"fields": {
+						"ngrams": {
+							"type": "text",
+							"analyzer": "ngrams",
+							"norms": false
+						}
+					}
+				}
+			}
+		},
 		"sponsors": {
 			"type": "object",
 			"properties": {
diff --git a/src/main/resources/elasticsearch/indices_version.json b/src/main/resources/elasticsearch/indices_version.json
index 27506ec5f1..970cd022ac 100644
--- a/src/main/resources/elasticsearch/indices_version.json
+++ b/src/main/resources/elasticsearch/indices_version.json
@@ -1,3 +1,3 @@
 {
-	"indicesVersion": "202110051430"
+	"indicesVersion": "202110211130"
 }
diff --git a/src/test/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptAttachmentResourceTest.java b/src/test/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptAttachmentResourceTest.java
index dbf754b59e..868724c950 100644
--- a/src/test/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptAttachmentResourceTest.java
+++ b/src/test/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptAttachmentResourceTest.java
@@ -13,6 +13,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
+import org.javers.common.collections.Lists;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,9 +30,11 @@
 
 import eu.dzhw.fdz.metadatamanagement.AbstractTest;
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.AnalysisPackage;
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.Script;
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.ScriptAttachmentMetadata;
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.repository.AnalysisPackageRepository;
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.service.helper.ScriptAttachmentFilenameBuilder;
+import eu.dzhw.fdz.metadatamanagement.common.domain.I18nString;
 import eu.dzhw.fdz.metadatamanagement.common.rest.TestUtil;
 import eu.dzhw.fdz.metadatamanagement.common.service.GridFsMetadataUpdateService;
 import eu.dzhw.fdz.metadatamanagement.common.service.JaversService;
@@ -116,6 +119,102 @@ public void testUploadValidAttachment() throws Exception {
                 + scriptAttachmentMetadata.getScriptUuid() + "/attachments/filename.txt")));
   }
 
+  @Test
+  @WithMockUser(authorities = AuthoritiesConstants.PUBLISHER, username = "test")
+  public void shouldDeleteAttachmentIfScriptIsDeleted() throws Exception {
+    AnalysisPackage analysisPackage =
+        UnitTestCreateDomainObjectUtils.buildAnalysisPackage("projectid");
+    analysisPackage = analysisPackageRepository.save(analysisPackage);
+    MockMultipartFile attachment =
+        new MockMultipartFile("file", "filename.txt", "text/plain", "some text".getBytes());
+    ScriptAttachmentMetadata scriptAttachmentMetadata =
+        UnitTestCreateDomainObjectUtils.buildScriptAttachmentMetadata(analysisPackage);
+    MockMultipartFile metadata = new MockMultipartFile("scriptAttachmentMetadata", "Blob",
+        "application/json", TestUtil.convertObjectToJsonBytes(scriptAttachmentMetadata));
+
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders
+                .multipart("/api/analysis-packages/"
+                    + scriptAttachmentMetadata.getAnalysisPackageId() + "/scripts/attachments")
+                .file(attachment).file(metadata))
+        .andExpect(status().isCreated());
+
+    scriptAttachmentMetadata.generateId();
+
+    // read the created attachment
+    mockMvc
+        .perform(get("/api/analysis-packages/"
+            + scriptAttachmentMetadata.getAnalysisPackageId() + "/scripts/attachments"))
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$.[0].analysisPackageId",
+            is(scriptAttachmentMetadata.getAnalysisPackageId())))
+        .andExpect(jsonPath("$.[0].masterId",
+            is("/public/files/analysis-packages/" + "ana-projectid$/scripts/"
+                + scriptAttachmentMetadata.getScriptUuid() + "/attachments/filename.txt")));
+
+    analysisPackage.setScripts(
+        Lists.asList(Script.builder().softwarePackage("R").softwarePackageVersion("1.0.0")
+            .title(new I18nString("de", "en")).uuid("5432").usedLanguage("de").build()));
+    // update the analysis package
+    mockMvc.perform(put("/api/analysis-packages/" + "/" + analysisPackage.getId())
+        .content(TestUtil.convertObjectToJsonBytes(analysisPackage))
+        .contentType(MediaType.APPLICATION_JSON)).andExpect(status().is2xxSuccessful());
+
+    // check that the script attachment has been deleted
+    mockMvc
+        .perform(get("/api/analysis-packages/" + scriptAttachmentMetadata.getAnalysisPackageId()
+            + "/scripts/attachments"))
+        .andExpect(status().isOk()).andExpect(jsonPath("$.length()", is(0)));
+  }
+  
+  @Test
+  @WithMockUser(authorities = AuthoritiesConstants.PUBLISHER, username = "test")
+  public void shouldNotDeleteAttachmentIfScriptIsModified() throws Exception {
+    AnalysisPackage analysisPackage =
+        UnitTestCreateDomainObjectUtils.buildAnalysisPackage("projectid");
+    analysisPackage = analysisPackageRepository.save(analysisPackage);
+    MockMultipartFile attachment =
+        new MockMultipartFile("file", "filename.txt", "text/plain", "some text".getBytes());
+    ScriptAttachmentMetadata scriptAttachmentMetadata =
+        UnitTestCreateDomainObjectUtils.buildScriptAttachmentMetadata(analysisPackage);
+    MockMultipartFile metadata = new MockMultipartFile("scriptAttachmentMetadata", "Blob",
+        "application/json", TestUtil.convertObjectToJsonBytes(scriptAttachmentMetadata));
+
+    mockMvc
+        .perform(
+            MockMvcRequestBuilders
+                .multipart("/api/analysis-packages/"
+                    + scriptAttachmentMetadata.getAnalysisPackageId() + "/scripts/attachments")
+                .file(attachment).file(metadata))
+        .andExpect(status().isCreated());
+
+    scriptAttachmentMetadata.generateId();
+
+    // read the created attachment
+    mockMvc
+        .perform(get("/api/analysis-packages/"
+            + scriptAttachmentMetadata.getAnalysisPackageId() + "/scripts/attachments"))
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$.[0].analysisPackageId",
+            is(scriptAttachmentMetadata.getAnalysisPackageId())))
+        .andExpect(jsonPath("$.[0].masterId",
+            is("/public/files/analysis-packages/" + "ana-projectid$/scripts/"
+                + scriptAttachmentMetadata.getScriptUuid() + "/attachments/filename.txt")));
+
+    analysisPackage.getScripts().get(0).setTitle(new I18nString("Neuer Titel", "New Title"));
+    // update the analysis package
+    mockMvc.perform(put("/api/analysis-packages/" + "/" + analysisPackage.getId())
+        .content(TestUtil.convertObjectToJsonBytes(analysisPackage))
+        .contentType(MediaType.APPLICATION_JSON)).andExpect(status().is2xxSuccessful());
+
+    // check that the script attachment has NOT been deleted
+    mockMvc
+        .perform(get("/api/analysis-packages/" + scriptAttachmentMetadata.getAnalysisPackageId()
+            + "/scripts/attachments"))
+        .andExpect(status().isOk()).andExpect(jsonPath("$.length()", is(1)));
+  }
+
   @Test
   @WithMockUser(authorities = AuthoritiesConstants.PUBLISHER, username = "test")
   public void testDeleteAttachment() throws Exception {

From b36ff66b65bb17a644b522674517491fc574689c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Thu, 21 Oct 2021 13:51:32 +0200
Subject: [PATCH 05/18] validate uniquenes of script uuids within analysis
 package (#2978)

---
 .../domain/AnalysisPackage.java               | 15 ++++---
 .../domain/ScriptAttachmentMetadata.java      |  7 +--
 ...java => AtMostOneAttachmentPerScript.java} |  4 +-
 ...tMostOneAttachmentPerScriptValidator.java} |  6 +--
 .../domain/validation/UniqueScriptUuids.java  | 42 ++++++++++++++++++
 .../UniqueScriptUuidsValidator.java           | 43 +++++++++++++++++++
 6 files changed, 103 insertions(+), 14 deletions(-)
 rename src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/{UniqueScriptId.java => AtMostOneAttachmentPerScript.java} (87%)
 rename src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/{UniqueScriptIdValidator.java => AtMostOneAttachmentPerScriptValidator.java} (86%)
 create mode 100644 src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuids.java
 create mode 100644 src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuidsValidator.java

diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/AnalysisPackage.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/AnalysisPackage.java
index fe51c70ad3..99abbc3825 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/AnalysisPackage.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/AnalysisPackage.java
@@ -16,6 +16,7 @@
 
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.projection.AnalysisPackageSubDocumentProjection;
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation.ValidAnalysisPackageId;
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation.UniqueScriptUuids;
 import eu.dzhw.fdz.metadatamanagement.common.domain.AbstractShadowableRdcDomainObject;
 import eu.dzhw.fdz.metadatamanagement.common.domain.I18nLink;
 import eu.dzhw.fdz.metadatamanagement.common.domain.I18nString;
@@ -54,6 +55,8 @@
     + "eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/"
     + "AnalysisPackage.html'>here</a> for further details.")
 @ValidShadowId(message = "analysis-package-management.error.analysis-package.id.pattern")
+@UniqueScriptUuids(
+    message = "analysis-package-management.error.analysis-package.scripts.unique-uuids")
 public class AnalysisPackage extends AbstractShadowableRdcDomainObject
     implements AnalysisPackageSubDocumentProjection {
   private static final long serialVersionUID = 3006197991079331471L;
@@ -152,9 +155,9 @@ public class AnalysisPackage extends AbstractShadowableRdcDomainObject
   @Valid
   private List<@I18nStringSize(max = StringLengths.MEDIUM,
       message = "analysis-package-management.error.analysis-package.institution.i18n-string-size") 
-              @I18nStringEntireNotEmpty(
+      @I18nStringEntireNotEmpty(
       message = "analysis-package-management.error.analysis-package.institution"
-              + ".i18n-string-entire-not-empty") I18nString> institutions;
+          + ".i18n-string-entire-not-empty") I18nString> institutions;
 
   /**
    * The names of the sponsors which have sponsored the study or project from which this analysis
@@ -166,9 +169,9 @@ public class AnalysisPackage extends AbstractShadowableRdcDomainObject
   @Valid
   private List<@I18nStringSize(max = StringLengths.MEDIUM,
       message = "analysis-package-management.error.analysis-package.sponsor.i18n-string-size") 
-               @I18nStringEntireNotEmpty(
+      @I18nStringEntireNotEmpty(
       message = "analysis-package-management.error.sponsor.institution"
-              + ".i18n-string-entire-not-empty") I18nString> sponsors;
+          + ".i18n-string-entire-not-empty") I18nString> sponsors;
 
   /**
    * The license of this analysis package. Markdown is supported.
@@ -201,8 +204,8 @@ public class AnalysisPackage extends AbstractShadowableRdcDomainObject
    * At least one {@link Script} must be specified.
    */
   @Valid
-  @Size(min = 1, message = "analysis-package-management.error.analysis-package."
-      + "scripts.at-leat-one")
+  @Size(min = 1,
+      message = "analysis-package-management.error.analysis-package." + "scripts.at-leat-one")
   private List<Script> scripts;
 
   /**
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/ScriptAttachmentMetadata.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/ScriptAttachmentMetadata.java
index 5621483b31..7ac5021614 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/ScriptAttachmentMetadata.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/ScriptAttachmentMetadata.java
@@ -6,7 +6,7 @@
 import org.javers.core.metamodel.annotation.Entity;
 import org.springframework.data.annotation.Id;
 
-import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation.UniqueScriptId;
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation.AtMostOneAttachmentPerScript;
 import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation.ValidScriptUuid;
 import eu.dzhw.fdz.metadatamanagement.common.domain.AbstractShadowableRdcDomainObject;
 import eu.dzhw.fdz.metadatamanagement.common.domain.util.Patterns;
@@ -31,8 +31,9 @@
 @Data
 @AllArgsConstructor
 @Builder
-@UniqueScriptId(message = "analysis-package-management.error.script-attachment-metadata"
-    + ".script-uuid.not-unique")
+@AtMostOneAttachmentPerScript(
+    message = "analysis-package-management.error.script-attachment-metadata"
+        + ".script-uuid.not-unique")
 @ValidScriptUuid(message = "analysis-package-management.error.script-attachment-metadata"
     + ".script-uuid.not-exists")
 public class ScriptAttachmentMetadata extends AbstractShadowableRdcDomainObject {
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptId.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/AtMostOneAttachmentPerScript.java
similarity index 87%
rename from src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptId.java
rename to src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/AtMostOneAttachmentPerScript.java
index 4e1021edf3..729296ff78 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptId.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/AtMostOneAttachmentPerScript.java
@@ -13,10 +13,10 @@
  * Ensure that there is at most one attachment per script.
  */
 @Documented
-@Constraint(validatedBy = {UniqueScriptIdValidator.class})
+@Constraint(validatedBy = {AtMostOneAttachmentPerScriptValidator.class})
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface UniqueScriptId {
+public @interface AtMostOneAttachmentPerScript {
 
   /**
    * Defines the default error message.
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptIdValidator.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/AtMostOneAttachmentPerScriptValidator.java
similarity index 86%
rename from src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptIdValidator.java
rename to src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/AtMostOneAttachmentPerScriptValidator.java
index e063bdf1e8..694a2ad775 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptIdValidator.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/AtMostOneAttachmentPerScriptValidator.java
@@ -14,8 +14,8 @@
 /**
  * Validate that there is at most one {@link ScriptAttachmentMetadata} per {@link Script}.
  */
-public class UniqueScriptIdValidator
-    implements ConstraintValidator<UniqueScriptId, ScriptAttachmentMetadata> {
+public class AtMostOneAttachmentPerScriptValidator
+    implements ConstraintValidator<AtMostOneAttachmentPerScript, ScriptAttachmentMetadata> {
   @Autowired
   private GridFsOperations operations;
 
@@ -25,7 +25,7 @@ public class UniqueScriptIdValidator
    * @see javax.validation.ConstraintValidator#initialize(java.lang.annotation.Annotation)
    */
   @Override
-  public void initialize(UniqueScriptId constraintAnnotation) {}
+  public void initialize(AtMostOneAttachmentPerScript constraintAnnotation) {}
 
   /*
    * (non-Javadoc)
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuids.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuids.java
new file mode 100644
index 0000000000..2bc2d2ed4d
--- /dev/null
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuids.java
@@ -0,0 +1,42 @@
+package eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.AnalysisPackage;
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.Script;
+
+/**
+ * Ensure that all {@link Script} uuids are unique within the {@link AnalysisPackage}.
+ * 
+ * @author René Reitmann
+ */
+@Documented
+@Constraint(validatedBy = {UniqueScriptUuidsValidator.class})
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UniqueScriptUuids {
+
+  /**
+   * Defines the default error message.
+   */
+  String message() default "{eu.dzhw.fdz.metadatamanagement.analyispackagemanagement"
+      + ".domain.validation.unqiueScriptUuid.message}";
+
+  /**
+   * This contains groups.
+   */
+  Class<?>[] groups() default {};
+
+  /**
+   * This method contains the payload.
+   */
+  Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuidsValidator.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuidsValidator.java
new file mode 100644
index 0000000000..cc91b749db
--- /dev/null
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/domain/validation/UniqueScriptUuidsValidator.java
@@ -0,0 +1,43 @@
+package eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.validation;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.AnalysisPackage;
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.Script;
+
+/**
+ * Ensure that all {@link Script} uuids are unique within the {@link AnalysisPackage}.
+ * 
+ * @author René Reitmann
+ */
+public class UniqueScriptUuidsValidator
+    implements ConstraintValidator<UniqueScriptUuids, AnalysisPackage> {
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see javax.validation.ConstraintValidator#initialize(java.lang.annotation.Annotation)
+   */
+  @Override
+  public void initialize(UniqueScriptUuids constraintAnnotation) {}
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see javax.validation.ConstraintValidator#isValid(java.lang.Object,
+   * javax.validation.ConstraintValidatorContext)
+   */
+  @Override
+  public boolean isValid(AnalysisPackage analysisPackage, ConstraintValidatorContext context) {
+    if (analysisPackage.getScripts() == null || analysisPackage.getScripts().isEmpty()) {
+      return true;
+    }
+    List<String> uniqueUuids = analysisPackage.getScripts().stream().map(Script::getUuid).distinct()
+        .collect(Collectors.toList());
+    return uniqueUuids.size() == analysisPackage.getScripts().size();
+  }
+}

From 8a0b7ac58bb13d989df743e87e9cc7c6d6533d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Fri, 22 Oct 2021 11:25:25 +0200
Subject: [PATCH 06/18] add endpoint to get all software packages (#2978)

---
 .../rest/ScriptSoftwarePackagesResource.java  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptSoftwarePackagesResource.java

diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptSoftwarePackagesResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptSoftwarePackagesResource.java
new file mode 100644
index 0000000000..d9291a59d4
--- /dev/null
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/analysispackagemanagement/rest/ScriptSoftwarePackagesResource.java
@@ -0,0 +1,34 @@
+package eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.rest;
+
+import java.lang.management.ManagementFactory;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.http.CacheControl;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import eu.dzhw.fdz.metadatamanagement.analysispackagemanagement.domain.SoftwarePackages;
+
+/**
+ * Provides a list of all available {@link SoftwarePackages}.
+ */
+@Controller
+@RequestMapping("/api")
+public class ScriptSoftwarePackagesResource {
+
+  private static final Long ETAG = ManagementFactory.getRuntimeMXBean().getStartTime();
+
+  /**
+   * Returns survey sample types.
+   */
+  @GetMapping(path = "/analysis-packages/scripts/software-packages")
+  public ResponseEntity<List<String>> getSoftwarePackages() {
+    return ResponseEntity.ok()
+        .cacheControl(CacheControl.maxAge(0, TimeUnit.DAYS).mustRevalidate().cachePublic())
+        .eTag(ETAG.toString())
+        .body(SoftwarePackages.ALL);
+  }
+}

From 9527006e7ef047d398a87324df61e47426f3733a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Fri, 22 Oct 2021 11:32:13 +0200
Subject: [PATCH 07/18] permit all users for analysis-packages endpoints
 (#2978)

---
 .../usermanagement/config/OAuth2ServerConfiguration.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/config/OAuth2ServerConfiguration.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/config/OAuth2ServerConfiguration.java
index f43b0c3614..e402cca45b 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/config/OAuth2ServerConfiguration.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/config/OAuth2ServerConfiguration.java
@@ -53,8 +53,9 @@ public void configure(HttpSecurity http) throws Exception {
           .antMatchers("/api/authenticate").permitAll().antMatchers("/api/register").permitAll()
           .antMatchers("/api/orders/**", "/public/files/**", "/api/variables/**", "/api/surveys/**",
               "/api/i18n/**", "/api/instruments/**", "/api/data-sets/**", "/api/questions/**",
-              "/api/data-packages/**", "/api/concepts/**", "/api/study-serieses/**",
-              "/api/related-publications/**", "/api/data-acquisition-projects/**/releases",
+              "/api/data-packages/**", "/api/analysis-packages/**", "/api/concepts/**",
+              "/api/study-serieses/**", "/api/related-publications/**",
+              "/api/data-acquisition-projects/**/releases",
               "/api/data-acquisition-projects/**/attachments", "/api/swagger-ui/**",
               "/api/swagger-ui.html", "/api/api-docs/**")
           .permitAll()

From 76707740b515fb8dd545881efa329d216c271ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Fri, 22 Oct 2021 13:52:53 +0200
Subject: [PATCH 08/18] update spring boot and javers amongst others (#3015)

---
 pom.xml                                          | 10 +++++-----
 .../rest/ConceptResourceController.java          | 14 ++++++--------
 .../rest/DataPackageAttachmentResource.java      | 15 +++++++--------
 .../DataPackageAttachmentVersionsResource.java   |  4 +---
 .../rest/DataPackageOverviewResource.java        |  8 +++-----
 .../rest/DataPackagePublicListResource.java      |  6 ++----
 .../rest/DataPackageResourceController.java      | 10 ++++------
 .../rest/DataPackageVersionsResource.java        |  4 +---
 .../DeleteAllDataPackagesResourceController.java |  4 +---
 ...vailableDataSetNumbersResourceController.java |  3 +--
 .../rest/DataFormatsResource.java                | 11 +++++------
 .../rest/DataSetAttachmentResource.java          | 11 +++++------
 .../rest/DataSetAttachmentVersionsResource.java  |  4 +---
 .../rest/DataSetReportResource.java              |  8 +++-----
 .../rest/DataSetResourceController.java          | 16 +++++++---------
 .../rest/DataSetVersionsResource.java            |  4 +---
 .../DeleteAllDataSetsResourceController.java     |  4 +---
 .../rest/InstrumentResourceController.java       | 14 ++++++--------
 .../rest/QuestionResourceController.java         | 14 ++++++--------
 .../RelatedPublicationResourceController.java    | 14 ++++++--------
 .../rest/SurveyResourceController.java           | 14 ++++++--------
 .../rest/VariableResourceController.java         | 14 ++++++--------
 22 files changed, 84 insertions(+), 122 deletions(-)

diff --git a/pom.xml b/pom.xml
index 675bc758f2..c674b59644 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath />
     </parent>
 
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs</artifactId>
-            <version>4.4.1</version>
+            <version>4.4.2</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>org.javers</groupId>
             <artifactId>javers-spring-boot-starter-mongo</artifactId>
-            <version>6.2.5</version>
+            <version>6.4.2</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
@@ -190,7 +190,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.5.11</version>
+            <version>1.5.12</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -302,7 +302,7 @@
         <dependency>
             <groupId>org.zalando</groupId>
             <artifactId>logbook-spring-boot-starter</artifactId>
-            <version>2.13.0</version>
+            <version>2.14.0</version>
             <exclusions>
                 <!-- Exclude http client cause it introduces vulnerability issues (snyk errors)-->
                 <exclusion>
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/conceptmanagement/rest/ConceptResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/conceptmanagement/rest/ConceptResourceController.java
index 2a96e04e6b..0313c5657b 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/conceptmanagement/rest/ConceptResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/conceptmanagement/rest/ConceptResourceController.java
@@ -2,9 +2,9 @@
 
 import java.net.URI;
 
-import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,7 +12,6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -32,9 +31,8 @@
  * 
  * @author René Reitmann
  */
-@RepositoryRestController
+@Controller
 @Tag(name = "Concept Resource", description = "Endpoints used by the MDM to manage concepts.")
-@RequestMapping("/api")
 public class ConceptResourceController
     extends GenericDomainObjectResourceController<Concept, CrudService<Concept>> {
 
@@ -45,7 +43,7 @@ public ConceptResourceController(CrudService<Concept> crudService,
 
   @Override
   @Operation(summary = "Get the concept.")
-  @GetMapping(value = "/concepts/{id:.+}")
+  @GetMapping(value = "/api/concepts/{id:.+}")
   @ResponseBody
   public ResponseEntity<Concept> getDomainObject(@PathVariable String id) {
     return super.getDomainObject(id);
@@ -53,19 +51,19 @@ public ResponseEntity<Concept> getDomainObject(@PathVariable String id) {
 
 
   @Override
-  @PostMapping(value = "/concepts")
+  @PostMapping(value = "/api/concepts")
   public ResponseEntity<?> postDomainObject(@RequestBody Concept concept) {
     return super.postDomainObject(concept);
   }
 
   @Override
-  @PutMapping(value = "/concepts/{id:.+}")
+  @PutMapping(value = "/api/concepts/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody Concept concept) {
     return super.putDomainObject(concept);
   }
 
   @Override
-  @DeleteMapping("/concepts/{id:.+}")
+  @DeleteMapping("/api/concepts/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentResource.java
index 1ad2cd5902..9483f4f3fb 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentResource.java
@@ -29,7 +29,6 @@
  * REST controller for uploading an dataPackage attachment.
  */
 @Controller
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataPackageAttachmentResource {
 
@@ -44,10 +43,10 @@ public class DataPackageAttachmentResource {
    * @throws URISyntaxException if a URI is syntactically wrong
    * @throws IOException If the attachment cannot be read
    */
-  @RequestMapping(path = "/data-packages/attachments", method = RequestMethod.POST)
+  @RequestMapping(path = "/api/data-packages/attachments", method = RequestMethod.POST)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<String> uploadAttachment(@RequestPart("file") MultipartFile multiPartFile,
-      @RequestPart("dataPackageAttachmentMetadata")
+      @RequestPart("dataPackageAttachmentMetadata") 
       @Valid DataPackageAttachmentMetadata dataPackageAttachmentMetadata)
       throws URISyntaxException, IOException {
     dataPackageAttachmentService.createDataPackageAttachment(multiPartFile,
@@ -63,8 +62,8 @@ public ResponseEntity<String> uploadAttachment(@RequestPart("file") MultipartFil
    * @param dataPackageId The id of an dataPackage.
    * @return A list of metadata objects.
    */
-  @RequestMapping(path = "/data-packages/{dataPackageId}/attachments", method = RequestMethod.GET,
-      produces = MediaType.APPLICATION_JSON_VALUE)
+  @RequestMapping(path = "/api/data-packages/{dataPackageId}/attachments",
+      method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<?> findByDataPackageId(
       @PathVariable("dataPackageId") String dataPackageId) {
     List<DataPackageAttachmentMetadata> metadata =
@@ -77,7 +76,7 @@ public ResponseEntity<?> findByDataPackageId(
    *
    * @param dataPackageId The id of the dataPackage.
    */
-  @RequestMapping(path = "/data-packages/{dataPackageId}/attachments",
+  @RequestMapping(path = "/api/data-packages/{dataPackageId}/attachments",
       method = RequestMethod.DELETE)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> deleteAllByDataPackageId(
@@ -92,7 +91,7 @@ public ResponseEntity<?> deleteAllByDataPackageId(
    * @param dataPackageId The id of the dataPackage.
    *
    */
-  @RequestMapping(path = "/data-packages/{dataPackageId}/attachments/{filename:.+}",
+  @RequestMapping(path = "/api/data-packages/{dataPackageId}/attachments/{filename:.+}",
       method = RequestMethod.DELETE)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> delete(@PathVariable("dataPackageId") String dataPackageId,
@@ -104,7 +103,7 @@ public ResponseEntity<?> delete(@PathVariable("dataPackageId") String dataPackag
   /**
    * Update the metadata of the given attachment of the given dataPackage.
    */
-  @RequestMapping(path = "/data-packages/{dataPackageId}/attachments/{filename:.+}",
+  @RequestMapping(path = "/api/data-packages/{dataPackageId}/attachments/{filename:.+}",
       method = RequestMethod.PUT)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> update(
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentVersionsResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentVersionsResource.java
index 113506e50c..82f93d27ad 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentVersionsResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageAttachmentVersionsResource.java
@@ -6,7 +6,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,7 +20,6 @@
  * @author René Reitmann
  */
 @RestController
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataPackageAttachmentVersionsResource {
 
@@ -37,7 +35,7 @@ public class DataPackageAttachmentVersionsResource {
    * 
    * @return A list of previous dataPackage versions
    */
-  @GetMapping("/data-packages/{dataPackageId}/attachments/{filename:.+}/versions")
+  @GetMapping("/api/data-packages/{dataPackageId}/attachments/{filename:.+}/versions")
   public ResponseEntity<?> findPreviousDataPackageAttachmentVersions(
       @PathVariable String dataPackageId, @PathVariable String filename,
       @RequestParam(name = "limit", defaultValue = "5") Integer limit,
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageOverviewResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageOverviewResource.java
index 1d33caf37e..fb71199696 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageOverviewResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageOverviewResource.java
@@ -15,7 +15,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -38,7 +37,6 @@
  * creating data package overview.
  */
 @Controller
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataPackageOverviewResource {
   private final MailService mailService;
@@ -65,7 +63,7 @@ public class DataPackageOverviewResource {
    * @return ok if the generation has been started successfully.
    * @throws IOException If the external task cannot be started.
    */
-  @PostMapping(value = "/data-packages/{dataPackageId}/overview/generate/{version:.+}")
+  @PostMapping(value = "/api/data-packages/{dataPackageId}/overview/generate/{version:.+}")
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> startOverviewGeneration(
       @PathVariable("dataPackageId") String dataPackageId, @PathVariable("version") String version,
@@ -86,7 +84,7 @@ public ResponseEntity<?> startOverviewGeneration(
    * @throws IOException Handles io exception for the template. (Freemarker Templates)
    * @throws TemplateException Handles template exceptions. (Freemarker Templates)
    */
-  @PostMapping(value = "/data-packages/{dataPackageId}/overview/fill-template")
+  @PostMapping(value = "/api/data-packages/{dataPackageId}/overview/fill-template")
   @Secured(value = {AuthoritiesConstants.TASK_USER})
   public ResponseEntity<Task> fillTemplate(@RequestParam("file") MultipartFile templateZip,
       @PathVariable("dataPackageId") String dataPackageId, @RequestParam("version") String version)
@@ -121,7 +119,7 @@ public ResponseEntity<Task> fillTemplate(@RequestParam("file") MultipartFile tem
    * @return 200 if attaching succeeded.
    * @throws IOException Thrown if the multipart file cannot be read.
    */
-  @PostMapping(value = "/data-packages/{dataPackageId}/overview/{language}")
+  @PostMapping(value = "/api/data-packages/{dataPackageId}/overview/{language}")
   @Secured(value = {AuthoritiesConstants.TASK_USER})
   public ResponseEntity<?> uploadOverview(@RequestParam("file") MultipartFile overviewFile,
       @PathVariable("dataPackageId") String dataPackageId,
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackagePublicListResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackagePublicListResource.java
index 21aed56938..7e56ab5fa3 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackagePublicListResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackagePublicListResource.java
@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -27,7 +26,6 @@
  *
  */
 @Controller
-@RequestMapping("/api")
 @Validated
 @Tag(name = "DataPackage List Resource",
     description = "Endpoint for retrieving released dataPackages.")
@@ -45,7 +43,7 @@ public class DataPackagePublicListResource {
    *         the paging.
    * @throws IOException if search failed
    */
-  @GetMapping(value = "/data-packages")
+  @GetMapping(value = "/api/data-packages")
   @Operation(summary = "Get the paged list of currently released data packages.")
   @ResponseBody
   public ResponseEntity<Page<DataPackageSearchDocument>> listDataPackages(
@@ -67,7 +65,7 @@ public ResponseEntity<Page<DataPackageSearchDocument>> listDataPackages(
    *         the paging.
    * @throws IOException if search failed
    */
-  @GetMapping(value = "/data-packages", params = "pinned=true")
+  @GetMapping(value = "/api/data-packages", params = "pinned=true")
   @Operation(summary = "Get a list of data packages, which shall be pinned to the start page")
   @ResponseBody
   public ResponseEntity<Page<DataPackageSearchDocument>> listPinnedDataPackages(
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageResourceController.java
index 3f499bead0..f1f799ccee 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageResourceController.java
@@ -16,7 +16,6 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -41,7 +40,6 @@
 @Controller
 @Tag(name = "DataPackage Resource",
     description = "Endpoints used by the MDM to manage dataPackages.")
-@RequestMapping("/api")
 @Slf4j
 public class DataPackageResourceController
     extends GenericDomainObjectResourceController<DataPackage, CrudService<DataPackage>> {
@@ -72,7 +70,7 @@ public DataPackageResourceController(CrudService<DataPackage> crudService,
           + " default MDM json. Public users will get the latest version "
           + "of the dataPackage. If the id is postfixed with the version number it will return"
           + " exactly the requested version, if available.")
-  @GetMapping(value = "/data-packages/{id:.+}")
+  @GetMapping(value = "/api/data-packages/{id:.+}")
   public ResponseEntity<?> getDataPackage(@PathVariable String id,
       @RequestParam(required = false) MetadataExportFormat format) {
     ResponseEntity<DataPackage> dataPackageEntity = super.getDomainObject(id);
@@ -115,19 +113,19 @@ public ResponseEntity<?> getDataPackage(@PathVariable String id,
   }
 
   @Override
-  @PostMapping(value = "/data-packages")
+  @PostMapping(value = "/api/data-packages")
   public ResponseEntity<?> postDomainObject(@RequestBody DataPackage dataPackage) {
     return super.postDomainObject(dataPackage);
   }
 
   @Override
-  @PutMapping(value = "/data-packages/{id:.+}")
+  @PutMapping(value = "/api/data-packages/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody DataPackage dataPackage) {
     return super.putDomainObject(dataPackage);
   }
 
   @Override
-  @DeleteMapping("/data-packages/{id:.+}")
+  @DeleteMapping("/api/data-packages/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageVersionsResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageVersionsResource.java
index 787f5ee405..8dc6ad05b6 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageVersionsResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DataPackageVersionsResource.java
@@ -6,7 +6,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,7 +19,6 @@
  * @author René Reitmann
  */
 @RestController
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataPackageVersionsResource {
 
@@ -35,7 +33,7 @@ public class DataPackageVersionsResource {
    * 
    * @return A list of previous dataPackage versions
    */
-  @GetMapping("/data-packages/{id}/versions")
+  @GetMapping("/api/data-packages/{id}/versions")
   public ResponseEntity<?> findPreviousDataPackageVersions(@PathVariable String id,
       @RequestParam(name = "limit", defaultValue = "5") Integer limit,
       @RequestParam(name = "skip", defaultValue = "0") Integer skip) {
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DeleteAllDataPackagesResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DeleteAllDataPackagesResourceController.java
index 740f7154e2..075d03882b 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DeleteAllDataPackagesResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datapackagemanagement/rest/DeleteAllDataPackagesResourceController.java
@@ -4,7 +4,6 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import eu.dzhw.fdz.metadatamanagement.datapackagemanagement.service.DataPackageManagementService;
@@ -19,7 +18,6 @@
  */
 
 @RestController
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DeleteAllDataPackagesResourceController {
   
@@ -32,7 +30,7 @@ public class DeleteAllDataPackagesResourceController {
    * @return no Content.
    */
   @Secured(value = {AuthoritiesConstants.DATA_PROVIDER, AuthoritiesConstants.PUBLISHER})
-  @DeleteMapping(value = "/data-acquisition-projects/{id}/data-packages")
+  @DeleteMapping(value = "/api/data-acquisition-projects/{id}/data-packages")
   public ResponseEntity<?> delete(@PathVariable String id) {
     dataPackageService.deleteAllDataPackagesByProjectId(id);
     return ResponseEntity.noContent().build();
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/AvailableDataSetNumbersResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/AvailableDataSetNumbersResourceController.java
index 7b61432d35..c954898f97 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/AvailableDataSetNumbersResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/AvailableDataSetNumbersResourceController.java
@@ -18,7 +18,6 @@
  * @author René Reitmann
  */
 @RestController
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class AvailableDataSetNumbersResourceController {
 
@@ -31,7 +30,7 @@ public class AvailableDataSetNumbersResourceController {
    * @return the list of dataSet numbers
    */
   @RequestMapping(method = RequestMethod.GET,
-      value = "/data-acquisition-projects/{id:.+}/available-data-set-numbers")
+      value = "/api/data-acquisition-projects/{id:.+}/available-data-set-numbers")
   public ResponseEntity<List<Integer>> findAvailableDataSetNumbers(@PathVariable String id) {
     List<Integer> dataSetNumbers = dataSetService.getFreeDataSetNumbers(id);
     return ResponseEntity.ok()
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataFormatsResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataFormatsResource.java
index c18b57f5fc..bc033c98f3 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataFormatsResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataFormatsResource.java
@@ -1,20 +1,19 @@
 package eu.dzhw.fdz.metadatamanagement.datasetmanagement.rest;
 
-import eu.dzhw.fdz.metadatamanagement.datasetmanagement.domain.DataFormat;
+import java.lang.management.ManagementFactory;
+import java.util.concurrent.TimeUnit;
+
 import org.springframework.http.CacheControl;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 
-import java.lang.management.ManagementFactory;
-import java.util.concurrent.TimeUnit;
+import eu.dzhw.fdz.metadatamanagement.datasetmanagement.domain.DataFormat;
 
 /**
  * Provides available {@link DataFormat}.
  */
 @Controller
-@RequestMapping("/api")
 public class DataFormatsResource {
 
   private static final Long ETAG = ManagementFactory.getRuntimeMXBean().getStartTime();
@@ -22,7 +21,7 @@ public class DataFormatsResource {
   /**
    * Return an array of available {@link DataFormat}.
    */
-  @GetMapping(path = "/data-sets/data-formats")
+  @GetMapping(path = "/api/data-sets/data-formats")
   public ResponseEntity<DataFormat[]> getDataFormats() {
     return ResponseEntity.ok()
         .cacheControl(CacheControl.maxAge(0, TimeUnit.DAYS).mustRevalidate().cachePublic())
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentResource.java
index 3d14d7557f..585a79f0e5 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentResource.java
@@ -29,7 +29,6 @@
  * REST controller for uploading an data sets attachment.
  */
 @Controller
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataSetAttachmentResource {
 
@@ -44,7 +43,7 @@ public class DataSetAttachmentResource {
    * @throws URISyntaxException if a URI is syntactically wrong
    * @throws IOException If the attachment cannot be read
    */
-  @RequestMapping(path = "/data-sets/attachments", method = RequestMethod.POST)
+  @RequestMapping(path = "/api/data-sets/attachments", method = RequestMethod.POST)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<String> uploadAttachment(@RequestPart("file") MultipartFile multiPartFile,
       @RequestPart("dataSetAttachmentMetadata") 
@@ -63,7 +62,7 @@ public ResponseEntity<String> uploadAttachment(@RequestPart("file") MultipartFil
    * @param dataSetId The id of an dataSet.
    * @return A list of metadata objects.
    */
-  @RequestMapping(path = "/data-sets/{dataSetId}/attachments", method = RequestMethod.GET,
+  @RequestMapping(path = "/api/data-sets/{dataSetId}/attachments", method = RequestMethod.GET,
       produces = MediaType.APPLICATION_JSON_VALUE)
   public ResponseEntity<?> findByDataSetId(@PathVariable("dataSetId") String dataSetId) {
     List<DataSetAttachmentMetadata> metadata = dataSetAttachmentService.findAllByDataSet(dataSetId);
@@ -75,7 +74,7 @@ public ResponseEntity<?> findByDataSetId(@PathVariable("dataSetId") String dataS
    * 
    * @param dataSetId The id of the dataSet.
    */
-  @RequestMapping(path = "/data-sets/{dataSetId}/attachments", method = RequestMethod.DELETE)
+  @RequestMapping(path = "/api/data-sets/{dataSetId}/attachments", method = RequestMethod.DELETE)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> deleteAllByDataSetId(@PathVariable("dataSetId") String dataSetId) {
     dataSetAttachmentService.deleteAllByDataSetId(dataSetId);
@@ -88,7 +87,7 @@ public ResponseEntity<?> deleteAllByDataSetId(@PathVariable("dataSetId") String
    * @param dataSetId The id of the dataSet.
    * 
    */
-  @RequestMapping(path = "/data-sets/{dataSetId}/attachments/{filename:.+}",
+  @RequestMapping(path = "/api/data-sets/{dataSetId}/attachments/{filename:.+}",
       method = RequestMethod.DELETE)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> delete(@PathVariable("dataSetId") String dataSetId,
@@ -100,7 +99,7 @@ public ResponseEntity<?> delete(@PathVariable("dataSetId") String dataSetId,
   /**
    * Update the metadata of the given attachment of the given dataSet.
    */
-  @RequestMapping(path = "/data-sets/{dataSetId}/attachments/{filename:.+}",
+  @RequestMapping(path = "/api/data-sets/{dataSetId}/attachments/{filename:.+}",
       method = RequestMethod.PUT)
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> update(
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentVersionsResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentVersionsResource.java
index 050c0a93da..b6f72d6928 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentVersionsResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetAttachmentVersionsResource.java
@@ -6,7 +6,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,7 +20,6 @@
  * @author René Reitmann
  */
 @RestController
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataSetAttachmentVersionsResource {
   
@@ -37,7 +35,7 @@ public class DataSetAttachmentVersionsResource {
    * 
    * @return A list of previous dataSet versions
    */
-  @GetMapping("/data-sets/{dataSetId}/attachments/{filename:.+}/versions")
+  @GetMapping("/api/data-sets/{dataSetId}/attachments/{filename:.+}/versions")
   public ResponseEntity<?> findPreviousdataSetAttachmentVersions(
       @PathVariable String dataSetId,
       @PathVariable String filename,
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetReportResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetReportResource.java
index 55ea38cd38..ba27e81d10 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetReportResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetReportResource.java
@@ -15,7 +15,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -37,7 +36,6 @@
  * This Resource handles the filling of the tex template and the upload of the compiled file.
  */
 @Controller
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataSetReportResource {
   private final DataSetReportService dataSetReportService;
@@ -63,7 +61,7 @@ public class DataSetReportResource {
    * @return ok if the generation has been started successfully.
    * @throws IOException If the external task cannot be started.
    */
-  @PostMapping(value = "/data-sets/{dataSetId}/report/generate/{version:.+}")
+  @PostMapping(value = "/api/data-sets/{dataSetId}/report/generate/{version:.+}")
   @Secured(value = {AuthoritiesConstants.PUBLISHER, AuthoritiesConstants.DATA_PROVIDER})
   public ResponseEntity<?> startReportGeneration(@PathVariable("dataSetId") String dataSetId,
       @PathVariable("version") String version, HttpServletRequest request,
@@ -83,7 +81,7 @@ public ResponseEntity<?> startReportGeneration(@PathVariable("dataSetId") String
    * @throws IOException Handles io exception for the template. (Freemarker Templates)
    * @throws TemplateException Handles template exceptions. (Freemarker Templates)
    */
-  @PostMapping(value = "/data-sets/{dataSetId}/report/fill-template")
+  @PostMapping(value = "/api/data-sets/{dataSetId}/report/fill-template")
   @Secured(value = {AuthoritiesConstants.TASK_USER})
   public ResponseEntity<Task> fillTemplate(@RequestParam("file") MultipartFile templateZip,
       @PathVariable("dataSetId") String dataSetId, @RequestParam("version") String version)
@@ -118,7 +116,7 @@ public ResponseEntity<Task> fillTemplate(@RequestParam("file") MultipartFile tem
    * @return 200 if attaching succeeded.
    * @throws IOException Thrown if the multipart file cannot be read.
    */
-  @PostMapping(value = "/data-sets/{dataSetId}/report/{language}")
+  @PostMapping(value = "/api/data-sets/{dataSetId}/report/{language}")
   @Secured(value = {AuthoritiesConstants.TASK_USER})
   public ResponseEntity<?> uploadReport(@RequestParam("file") MultipartFile reportFile,
       @PathVariable("dataSetId") String dataSetId, @RequestParam("onBehalfOf") String onBehalfOf,
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetResourceController.java
index d33cbc0eb5..79df661cfa 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetResourceController.java
@@ -2,15 +2,14 @@
 
 import java.net.URI;
 
-import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -26,9 +25,8 @@
  * 
  * @author René Reitmann
  */
-@RepositoryRestController
-@Tag(name = "Dataset Resource", description = "Endpoints used by the MDM to manage questions.")
-@RequestMapping("/api")
+@Controller
+@Tag(name = "Dataset Resource", description = "Endpoints used by the MDM to manage datasets.")
 public class DataSetResourceController
     extends GenericDomainObjectResourceController<DataSet, CrudService<DataSet>> {
 
@@ -42,7 +40,7 @@ public DataSetResourceController(CrudService<DataSet> crudService,
       summary = "Get the dataset. Public users will get the latest version of the dataset."
           + " If the id is postfixed with the version number it will return exactly the "
           + "requested version, if available.")
-  @GetMapping(value = "/data-sets/{id:.+}")
+  @GetMapping(value = "/api/data-sets/{id:.+}")
   @ResponseBody
   public ResponseEntity<DataSet> getDomainObject(@PathVariable String id) {
     return super.getDomainObject(id);
@@ -50,19 +48,19 @@ public ResponseEntity<DataSet> getDomainObject(@PathVariable String id) {
 
 
   @Override
-  @PostMapping(value = "/data-sets")
+  @PostMapping(value = "/api/data-sets")
   public ResponseEntity<?> postDomainObject(@RequestBody DataSet dataSet) {
     return super.postDomainObject(dataSet);
   }
 
   @Override
-  @PutMapping(value = "/data-sets/{id:.+}")
+  @PutMapping(value = "/api/data-sets/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody DataSet dataSet) {
     return super.putDomainObject(dataSet);
   }
 
   @Override
-  @DeleteMapping("/data-sets/{id:.+}")
+  @DeleteMapping("/api/data-sets/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetVersionsResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetVersionsResource.java
index d6fe073725..e16ea50bb2 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetVersionsResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DataSetVersionsResource.java
@@ -6,7 +6,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,7 +19,6 @@
  * @author René Reitmann
  */
 @RestController
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DataSetVersionsResource {
 
@@ -35,7 +33,7 @@ public class DataSetVersionsResource {
    * 
    * @return A list of previous dataSet versions
    */
-  @GetMapping("/data-sets/{id}/versions")
+  @GetMapping("/api/data-sets/{id}/versions")
   public ResponseEntity<?> findPreviousDataSetVersions(@PathVariable String id,
       @RequestParam(name = "limit", defaultValue = "5") Integer limit,
       @RequestParam(name = "skip", defaultValue = "0") Integer skip) {
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DeleteAllDataSetsResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DeleteAllDataSetsResourceController.java
index 372083449a..25c6c27f6b 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DeleteAllDataSetsResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/datasetmanagement/rest/DeleteAllDataSetsResourceController.java
@@ -4,7 +4,6 @@
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import eu.dzhw.fdz.metadatamanagement.datasetmanagement.domain.DataSet;
@@ -19,7 +18,6 @@
  *
  */
 @RestController
-@RequestMapping("/api")
 @RequiredArgsConstructor
 public class DeleteAllDataSetsResourceController {
  
@@ -32,7 +30,7 @@ public class DeleteAllDataSetsResourceController {
    * @return no Content.
    */
   @Secured(value = {AuthoritiesConstants.DATA_PROVIDER, AuthoritiesConstants.PUBLISHER})
-  @DeleteMapping(value = "/data-acquisition-projects/{id}/data-sets")
+  @DeleteMapping(value = "/api/data-acquisition-projects/{id}/data-sets")
   public ResponseEntity<DataSet> delete(@PathVariable String id) {
     dataSetService.deleteDataSetsByProjectId(id);
     return ResponseEntity.noContent().build();
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/rest/InstrumentResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/rest/InstrumentResourceController.java
index a791f68143..db53abb5cf 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/rest/InstrumentResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/rest/InstrumentResourceController.java
@@ -2,15 +2,14 @@
 
 import java.net.URI;
 
-import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -26,9 +25,8 @@
  *
  * @author René Reitmann
  */
-@RepositoryRestController
+@Controller
 @Tag(name = "Instrument Resource", description = "Endpoints used by the MDM to manage instruments.")
-@RequestMapping("/api")
 public class InstrumentResourceController
     extends GenericDomainObjectResourceController<Instrument, CrudService<Instrument>> {
 
@@ -43,7 +41,7 @@ public InstrumentResourceController(CrudService<Instrument> crudService,
           + " instrument."
           + " If the id is postfixed with the version number it will return exactly the "
           + "requested version, if available.")
-  @GetMapping(value = "/instruments/{id:.+}")
+  @GetMapping(value = "/api/instruments/{id:.+}")
   @ResponseBody
   public ResponseEntity<Instrument> getDomainObject(@PathVariable String id) {
     return super.getDomainObject(id);
@@ -51,19 +49,19 @@ public ResponseEntity<Instrument> getDomainObject(@PathVariable String id) {
 
 
   @Override
-  @PostMapping(value = "/instruments")
+  @PostMapping(value = "/api/instruments")
   public ResponseEntity<?> postDomainObject(@RequestBody Instrument instrument) {
     return super.postDomainObject(instrument);
   }
 
   @Override
-  @PutMapping(value = "/instruments/{id:.+}")
+  @PutMapping(value = "/api/instruments/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody Instrument instrument) {
     return super.putDomainObject(instrument);
   }
 
   @Override
-  @DeleteMapping("/instruments/{id:.+}")
+  @DeleteMapping("/api/instruments/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/rest/QuestionResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/rest/QuestionResourceController.java
index baab321586..6e19461d43 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/rest/QuestionResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/questionmanagement/rest/QuestionResourceController.java
@@ -2,15 +2,14 @@
 
 import java.net.URI;
 
-import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -26,9 +25,8 @@
  * 
  * @author René Reitmann
  */
-@RepositoryRestController
+@Controller
 @Tag(name = "Question Resource", description = "Endpoints used by the MDM to manage questions.")
-@RequestMapping("/api")
 public class QuestionResourceController
     extends GenericDomainObjectResourceController<Question, CrudService<Question>> {
 
@@ -41,7 +39,7 @@ public QuestionResourceController(CrudService<Question> crudService,
   @Operation(summary = "Get the question. Public users will get the latest version of the question."
       + " If the id is postfixed with the version number it will return exactly the "
       + "requested version, if available.")
-  @GetMapping(value = "/questions/{id:.+}")
+  @GetMapping(value = "/api/questions/{id:.+}")
   @ResponseBody
   public ResponseEntity<Question> getDomainObject(@PathVariable String id) {
     return super.getDomainObject(id);
@@ -49,19 +47,19 @@ public ResponseEntity<Question> getDomainObject(@PathVariable String id) {
 
 
   @Override
-  @PostMapping(value = "/questions")
+  @PostMapping(value = "/api/questions")
   public ResponseEntity<?> postDomainObject(@RequestBody Question question) {
     return super.postDomainObject(question);
   }
 
   @Override
-  @PutMapping(value = "/questions/{id:.+}")
+  @PutMapping(value = "/api/questions/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody Question question) {
     return super.putDomainObject(question);
   }
 
   @Override
-  @DeleteMapping("/questions/{id:.+}")
+  @DeleteMapping("/api/questions/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/relatedpublicationmanagement/rest/RelatedPublicationResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/relatedpublicationmanagement/rest/RelatedPublicationResourceController.java
index f6d4635e92..33ba34c393 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/relatedpublicationmanagement/rest/RelatedPublicationResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/relatedpublicationmanagement/rest/RelatedPublicationResourceController.java
@@ -2,15 +2,14 @@
 
 import java.net.URI;
 
-import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -26,10 +25,9 @@
  * 
  * @author René Reitmann
  */
-@RepositoryRestController
+@Controller
 @Tag(name = "Publication Resource",
     description = "Endpoints used by the MDM to manage publications.")
-@RequestMapping("/api")
 public class RelatedPublicationResourceController extends
     GenericDomainObjectResourceController<RelatedPublication, CrudService<RelatedPublication>> {
 
@@ -40,7 +38,7 @@ public RelatedPublicationResourceController(CrudService<RelatedPublication> crud
 
   @Override
   @Operation(summary = "Get the publication.")
-  @GetMapping(value = "/related-publications/{id:.+}")
+  @GetMapping(value = "/api/related-publications/{id:.+}")
   @ResponseBody
   public ResponseEntity<RelatedPublication> getDomainObject(@PathVariable String id) {
     return super.getDomainObject(id);
@@ -48,19 +46,19 @@ public ResponseEntity<RelatedPublication> getDomainObject(@PathVariable String i
 
 
   @Override
-  @PostMapping(value = "/related-publications")
+  @PostMapping(value = "/api/related-publications")
   public ResponseEntity<?> postDomainObject(@RequestBody RelatedPublication relatedPublication) {
     return super.postDomainObject(relatedPublication);
   }
 
   @Override
-  @PutMapping(value = "/related-publications/{id:.+}")
+  @PutMapping(value = "/api/related-publications/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody RelatedPublication relatedPublication) {
     return super.putDomainObject(relatedPublication);
   }
 
   @Override
-  @DeleteMapping("/related-publications/{id:.+}")
+  @DeleteMapping("/api/related-publications/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/surveymanagement/rest/SurveyResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/surveymanagement/rest/SurveyResourceController.java
index fa3cfc6c48..2831bba2d4 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/surveymanagement/rest/SurveyResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/surveymanagement/rest/SurveyResourceController.java
@@ -2,15 +2,14 @@
 
 import java.net.URI;
 
-import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -26,9 +25,8 @@
  * 
  * @author René Reitmann
  */
-@RepositoryRestController
+@Controller
 @Tag(name = "Survey Resource", description = "Endpoints used by the MDM to manage surveys.")
-@RequestMapping("/api")
 public class SurveyResourceController
     extends GenericDomainObjectResourceController<Survey, CrudService<Survey>> {
 
@@ -41,7 +39,7 @@ public SurveyResourceController(CrudService<Survey> crudService,
   @Operation(summary = "Get the survey. Public users will get the latest version of the survey."
       + " If the id is postfixed with the version number it will return exactly the "
       + "requested version, if available.")
-  @GetMapping(value = "/surveys/{id:.+}")
+  @GetMapping(value = "/api/surveys/{id:.+}")
   @ResponseBody
   public ResponseEntity<Survey> getDomainObject(@PathVariable String id) {
     return super.getDomainObject(id);
@@ -49,19 +47,19 @@ public ResponseEntity<Survey> getDomainObject(@PathVariable String id) {
 
 
   @Override
-  @PostMapping(value = "/surveys")
+  @PostMapping(value = "/api/surveys")
   public ResponseEntity<?> postDomainObject(@RequestBody Survey survey) {
     return super.postDomainObject(survey);
   }
 
   @Override
-  @PutMapping(value = "/surveys/{id:.+}")
+  @PutMapping(value = "/api/surveys/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody Survey survey) {
     return super.putDomainObject(survey);
   }
 
   @Override
-  @DeleteMapping("/surveys/{id:.+}")
+  @DeleteMapping("/api/surveys/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/rest/VariableResourceController.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/rest/VariableResourceController.java
index 29b81c98a9..f124928296 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/rest/VariableResourceController.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/variablemanagement/rest/VariableResourceController.java
@@ -2,15 +2,14 @@
 
 import java.net.URI;
 
-import org.springframework.data.rest.webmvc.RepositoryRestController;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -26,9 +25,8 @@
  *
  * @author René Reitmann
  */
-@RepositoryRestController
+@Controller
 @Tag(name = "Variable Resource", description = "Endpoints used by the MDM to manage variables.")
-@RequestMapping("/api")
 public class VariableResourceController
     extends GenericDomainObjectResourceController<Variable, CrudService<Variable>> {
 
@@ -42,7 +40,7 @@ public VariableResourceController(CrudService<Variable> crudService,
       summary = "Get the variable. Public users will get the latest version of the variables."
           + " If the id is postfixed with the version number it will return exactly the "
           + "requested version, if available.")
-  @GetMapping(value = "/variables/{id:.+}")
+  @GetMapping(value = "/api/variables/{id:.+}")
   @ResponseBody
   public ResponseEntity<Variable> getDomainObject(@PathVariable String id) {
     return super.getDomainObject(id);
@@ -50,19 +48,19 @@ public ResponseEntity<Variable> getDomainObject(@PathVariable String id) {
 
 
   @Override
-  @PostMapping(value = "/variables")
+  @PostMapping(value = "/api/variables")
   public ResponseEntity<?> postDomainObject(@RequestBody Variable variable) {
     return super.postDomainObject(variable);
   }
 
   @Override
-  @PutMapping(value = "/variables/{id:.+}")
+  @PutMapping(value = "/api/variables/{id:.+}")
   public ResponseEntity<?> putDomainObject(@RequestBody Variable domainObject) {
     return super.putDomainObject(domainObject);
   }
 
   @Override
-  @DeleteMapping("/variables/{id:.+}")
+  @DeleteMapping("/api/variables/{id:.+}")
   public ResponseEntity<?> deleteDomainObject(@PathVariable String id) {
     return super.deleteDomainObject(id);
   }

From a8f87e2e6a8858ecc99b2b250f4d18c52d2d42fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 2 Nov 2021 15:39:11 +0100
Subject: [PATCH 09/18] stop using git protocol

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d8e32c7d02..b83c16dc04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5202,8 +5202,8 @@
       }
     },
     "grunt-contrib-uglify-es": {
-      "version": "git+ssh://git@github.com/gruntjs/grunt-contrib-uglify.git#ccb95a70cad6a4e9e902d3bd5d0e38a4de09a1e1",
-      "from": "grunt-contrib-uglify-es@git://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
+      "version": "git+https://github.com/gruntjs/grunt-contrib-uglify.git#ccb95a70cad6a4e9e902d3bd5d0e38a4de09a1e1",
+      "from": "git+https://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
       "dev": true,
       "requires": {
         "chalk": "^1.0.0",
diff --git a/package.json b/package.json
index 35aaa41948..9a861797fd 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "grunt-contrib-cssmin": "4.0.0",
     "grunt-contrib-htmlmin": "3.1.0",
     "grunt-contrib-jshint": "3.1.1",
-    "grunt-contrib-uglify-es": "git://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
+    "grunt-contrib-uglify-es": "git+https://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
     "grunt-contrib-watch": "1.1.0",
     "grunt-html-angular-validate": "0.6.1",
     "grunt-jscs": "3.0.1",

From 3f775f657f004b4d5671db30a2964960e212a11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Mon, 8 Nov 2021 10:24:50 +0100
Subject: [PATCH 10/18] fix broken ie e2e test

---
 .../assign_and_unassign_concept_to_and_from_instrument.robot     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
index df4189b8bc..a8a2d8134c 100644
--- a/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
+++ b/src/test/robotframework/data_provider/conceptmanagement/assign_and_unassign_concept_to_and_from_instrument.robot
@@ -29,6 +29,7 @@ Click on Instrument Edit Button
 
 Assign Concept to an Instrument
    Click Element  xpath=//md-chips[@name="concepts"]//input[@placeholder="Konzepte suchen..."]
+   Input Text  xpath=//md-chips[@name="concepts"]//input[@placeholder="Konzepte suchen..."]  Test Konzept ${BROWSER}
    Run Keyword If    '${BROWSER}' == 'firefox'  Click Element Through Tooltips  xpath=//md-virtual-repeat-container[@ng-hide="$mdAutocompleteCtrl.hidden"]//ul//li//span//span[contains(., "con-i8h7b1a0e4e4i8f5b1$")]
    Run Keyword If    '${BROWSER}' == 'chrome'  Click Element Through Tooltips  xpath=//md-virtual-repeat-container[@ng-hide="$mdAutocompleteCtrl.hidden"]//ul//li//span//span[contains(., "con-d3i8h7i8g6g6i8f5b1$")]
    Run Keyword If    '${BROWSER}' == 'safari'  Click Element Through Tooltips  xpath=//md-virtual-repeat-container[@ng-hide="$mdAutocompleteCtrl.hidden"]//ul//li//span//span[contains(., "con-e2j9h7i8g6g6i9g6c2$")]

From 02bf66dc634a20d3f21204d54df06b6b17aa7b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Mon, 8 Nov 2021 10:39:05 +0100
Subject: [PATCH 11/18] close attachment dialog

---
 .../surveymanagement/check_attachment_versioning.robot        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test/robotframework/data_provider/surveymanagement/check_attachment_versioning.robot b/src/test/robotframework/data_provider/surveymanagement/check_attachment_versioning.robot
index 66a41027bc..d0887e3bf2 100644
--- a/src/test/robotframework/data_provider/surveymanagement/check_attachment_versioning.robot
+++ b/src/test/robotframework/data_provider/surveymanagement/check_attachment_versioning.robot
@@ -17,6 +17,7 @@ Editing survey attachement and check versioning
     Page Should Contain    vor ein paar Sekunden
     Revise to second latest version
     Click Attachment Save Button
+    Close Attachment Dialog
     [Teardown]    Get back to german home page
 
 *** Keywords ***
@@ -31,3 +32,6 @@ Revise to second latest version
 
 Click Attachment Restore Dialogue
     Click Element Through Tooltips    xpath=//form//button[md-icon[text()='history']]
+
+Close Attachment Dialog
+    Click Element Through Tooltips    xpath=//button[md-icon[text()='clear']]

From 3243f763abfe1a61e91b31df7a514c349a1473b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 9 Nov 2021 14:57:57 +0100
Subject: [PATCH 12/18] switch to https for sending robot test status

---
 src/test/robotframework/libs/SauceLabs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/robotframework/libs/SauceLabs.py b/src/test/robotframework/libs/SauceLabs.py
index 7700dbeafa..98e0409671 100644
--- a/src/test/robotframework/libs/SauceLabs.py
+++ b/src/test/robotframework/libs/SauceLabs.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from robot.libraries.BuiltIn import BuiltIn
-from six.moves.http_client import HTTPConnection
+from six.moves.http_client import HTTPSConnection
 
 import base64
 import os
@@ -42,7 +42,7 @@ def report_test_status(self, name, status, tags=[], remote_url=''):
                            'passed': status == 'PASS',
                            'tags': tags})
 
-        connection = HTTPConnection('saucelabs.com')
+        connection = HTTPSConnection('saucelabs.com')
         connection.request('PUT', '/rest/v1/%s/jobs/%s' % (
             username, job_id), body,
             headers={'Authorization': 'Basic %s' % token}

From 520afbd3e57ae7200e71e8ea82ee15f2e20ead3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 10 Nov 2021 09:29:32 +0100
Subject: [PATCH 13/18] add wait for login

---
 .../data_provider/common/check_banner_as_dataproviders.robot     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot b/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
index 1ec1fcdc53..604f658da5 100644
--- a/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
+++ b/src/test/robotframework/data_provider/common/check_banner_as_dataproviders.robot
@@ -6,6 +6,7 @@ Resource          ../../resources/check_url_resource.robot
 
 *** Test Cases ***
 Check for Dataproviders Welcome Banner Appears
+   Wait For Angular  10s
    Data Provider Logout   # explicit logout to sync with suite setup
    Login as dataprovidertest
    Assert Welcome Text After Login

From 95f1a5cc646d88e2b3c544a7c6d5ec248f61ed85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 10 Nov 2021 09:40:22 +0100
Subject: [PATCH 14/18] fix documentation build

---
 docs/source/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/source/requirements.txt b/docs/source/requirements.txt
index 5cdcad8409..0306612653 100644
--- a/docs/source/requirements.txt
+++ b/docs/source/requirements.txt
@@ -1 +1,2 @@
 javasphinx==0.9.15
+docutils==0.17.1

From 0cda5f77cd4b9b5f4c9167374a57cfba0d334d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 10 Nov 2021 11:10:44 +0100
Subject: [PATCH 15/18] remove javasphinx from docs-dependencies

---
 docs/source/requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/source/requirements.txt b/docs/source/requirements.txt
index 0306612653..7f188145b4 100644
--- a/docs/source/requirements.txt
+++ b/docs/source/requirements.txt
@@ -1,2 +1 @@
-javasphinx==0.9.15
 docutils==0.17.1

From a874665c16f15e21499837ddc9001d0081e38e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Wed, 10 Nov 2021 11:14:47 +0100
Subject: [PATCH 16/18] remove javasphinx from modules

---
 docs/source/conf.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index f199f81889..0aa7d6f5e1 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,8 +48,7 @@
     'sphinx.ext.coverage',
     'sphinx.ext.mathjax',
     'sphinx.ext.ifconfig',
-    'sphinx.ext.viewcode',
-    'javasphinx',
+    'sphinx.ext.viewcode'
 ]
 
 # Add any paths that contain templates here, relative to this directory.

From a43d287ce820567bfee1883751bfc62a584f4170 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sun, 14 Nov 2021 04:40:54 +0000
Subject: [PATCH 17/18] fix: pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index c674b59644..c2faf1a1d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.5.6</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <groupId>eu.dzhw.fdz</groupId>
@@ -175,7 +175,7 @@
         <dependency>
             <groupId>org.javers</groupId>
             <artifactId>javers-spring-boot-starter-mongo</artifactId>
-            <version>6.4.2</version>
+            <version>6.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
@@ -410,7 +410,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore />
+                                        <ignore/>
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
@@ -423,7 +423,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore />
+                                        <ignore/>
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
@@ -436,7 +436,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore />
+                                        <ignore/>
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
@@ -449,7 +449,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore />
+                                        <ignore/>
                                     </action>
                                 </pluginExecution>
                             </pluginExecutions>

From c1282e16078e3900b029aba3f69f3454fbaa473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?= <reitmann@dzhw.eu>
Date: Tue, 16 Nov 2021 12:16:14 +0100
Subject: [PATCH 18/18] format pom

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c2faf1a1d8..4675d8d804 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.5.6</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>eu.dzhw.fdz</groupId>
@@ -410,7 +410,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore/>
+                                        <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
@@ -423,7 +423,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore/>
+                                        <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
@@ -436,7 +436,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore/>
+                                        <ignore />
                                     </action>
                                 </pluginExecution>
                                 <pluginExecution>
@@ -449,7 +449,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <ignore/>
+                                        <ignore />
                                     </action>
                                 </pluginExecution>
                             </pluginExecutions>