Merge pull request #2494 from dzhw/release

Release Sprint 97
dzhw · Jan 27, 2020 · c27ac68 · c27ac68
2 parents a85ce68 + 6b2a8e3
commit c27ac68
Show file tree

Hide file tree

Showing 385 changed files with 14,958 additions and 10,725 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -7,7 +7,7 @@
     "eqeqeq": true,
     "immed": true,
     "indent": 4,
-    "latedef": true,
+    "latedef": false,
     "newcap": true,
     "noarg": true,
     "quotmark": "single",

diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ addons:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - g++-4.9
+    - g++-7
 stages:
 - name: build
   if: NOT branch =~ /^(development|master|test)$/
@@ -34,7 +34,7 @@ jobs:
   - stage: build
     name: Client & Server Build
     install:
-    - export CXX=g++-4.9
+    - export CXX=g++-7
     - export NODE_OPTIONS=--max-old-space-size=4096
     - export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
     - wget https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.zip
@@ -55,7 +55,7 @@ jobs:
   - stage: build and deploy
     name: Build and Deploy to PWS
     install:
-    - export CXX=g++-4.9
+    - export CXX=g++-7
     - export NODE_OPTIONS=--max-old-space-size=4096
     - export MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.pl.project13.maven.git=WARN
     - wget https://archive.apache.org/dist/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.zip

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -660,15 +660,17 @@ module.exports = function(grunt) {
             'eu/dzhw/fdz/metadatamanagement/searchmanagement/documents'
         },
         sources: {
-          src: ['src/main/webapp/scripts/studymanagement/**/translations*.js',
+          src: [
+            'src/main/webapp/scripts/studymanagement/**/translations*.js',
             'src/main/webapp/scripts/conceptmanagement/**/translations*.js',
             'src/main/webapp/scripts/surveymanagement/**/translations*.js',
             'src/main/webapp/scripts/instrumentmanagement/**/translations*.js',
             'src/main/webapp/scripts/questionmanagement/**/translations*.js',
             'src/main/webapp/scripts/datasetmanagement/**/translations*.js',
             'src/main/webapp/scripts/variablemanagement/**/translations*.js',
             'src/main/webapp/scripts/relatedpublicationmanagement/**/' +
-            'translations*.js']
+            'translations*.js'
+          ]
         }
       }
     });

diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
-[![Build Status](https://travis-ci.org/dzhw/metadatamanagement.svg?branch=master)](https://travis-ci.org/dzhw/metadatamanagement) [![Documentation Status](https://readthedocs.org/projects/metadatamanagement/badge/?version=latest)](https://metadatamanagement.readthedocs.io/de/latest/?badge=latest) [![Sauce Test Status](https://saucelabs.com/buildstatus/rreitmann)](https://saucelabs.com/u/rreitmann)
+[![Build Status](https://travis-ci.org/dzhw/metadatamanagement.svg?branch=master)](https://travis-ci.org/dzhw/metadatamanagement) [![Documentation Status](https://readthedocs.org/projects/metadatamanagement/badge/?version=latest)](https://metadatamanagement.readthedocs.io/de/latest/?badge=latest)
 [![Known Backend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=pom.xml)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=pom.xml
 )[![Known Frontend Vulnerabilities](https://snyk.io/test/github/dzhw/metadatamanagement/badge.svg?targetFile=package.json)](https://snyk.io/test/github/dzhw/metadatamanagement?targetFile=package.json
 )[![codecov](https://codecov.io/gh/dzhw/metadatamanagement/branch/development/graph/badge.svg)](https://codecov.io/gh/dzhw/metadatamanagement)[![Mergify Status](https://gh.mergify.io/badges/dzhw/metadatamanagement.png?style=cut)](https://mergify.io)
 [![DOI](https://zenodo.org/badge/39431147.svg)](https://zenodo.org/badge/latestdoi/39431147)
 
-[![Sauce Build Matrix](https://saucelabs.com/browser-matrix/rreitmann.svg)](https://saucelabs.com/u/rreitmann)
 # Metadatamanagement (MDM)
 
 The MDM holds the metadata of the studies which are available as data products in our Research Data Center [FDZ](https://fdz.dzhw.eu). It enables researchers to browse our data products before signing a contract for using the data.

diff --git a/...rce/javadoc/eu/dzhw/fdz/metadatamanagement/conceptmanagement/domain/Concept.rst b/...rce/javadoc/eu/dzhw/fdz/metadatamanagement/conceptmanagement/domain/Concept.rst
@@ -36,9 +36,7 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.conceptmanagement.domain.projections ConceptSubDocumentProjection
 
-.. java:import:: io.searchbox.annotations JestId
-
-.. java:import:: io.swagger.annotations ApiModel
+.. java:import:: io.swagger.v3.oas.annotations.media Schema
 
 .. java:import:: lombok AllArgsConstructor
 
@@ -58,7 +56,7 @@ Concept
 .. java:package:: eu.dzhw.fdz.metadatamanagement.conceptmanagement.domain
    :noindex:
 
-.. java:type:: @Entity @Document @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder @ApiModel public class Concept extends AbstractRdcDomainObject implements ConceptSubDocumentProjection
+.. java:type:: @Entity @Document @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder @Schema public class Concept extends AbstractRdcDomainObject implements ConceptSubDocumentProjection
 
    A concept is something which cannot be observed directly but there is a model which helps observing the concept. E.g.: The concept "Personality" can be observed with the help of the five-factor model (Big5).
 
@@ -99,7 +97,7 @@ doi
 id
 ^^
 
-.. java:field:: @Id @JestId @NotEmpty @Pattern @Size private String id
+.. java:field:: @Id @NotEmpty @Pattern @Size private String id
    :outertype: Concept
 
    The id of the concept which uniquely identifies the concept in this application. Must not be empty and must not contain more than 512 characters. Must start with "con-" and end with "$" and must not contain any whitespace.

diff --git a/...rce/javadoc/eu/dzhw/fdz/metadatamanagement/datasetmanagement/domain/DataSet.rst b/...rce/javadoc/eu/dzhw/fdz/metadatamanagement/datasetmanagement/domain/DataSet.rst
@@ -56,8 +56,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.variablemanagement.domain Variable
 
-.. java:import:: io.searchbox.annotations JestId
-
 .. java:import:: lombok AccessLevel
 
 .. java:import:: lombok AllArgsConstructor
@@ -121,7 +119,7 @@ format
 id
 ^^
 
-.. java:field:: @Id @JestId @NotEmpty @Setter private String id
+.. java:field:: @Id @NotEmpty @Setter private String id
    :outertype: DataSet
 
    The id of the dataset which uniquely identifies the dataset in this application.

diff --git a/...vadoc/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/domain/Instrument.rst b/...vadoc/eu/dzhw/fdz/metadatamanagement/instrumentmanagement/domain/Instrument.rst
@@ -50,8 +50,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.surveymanagement.domain Survey
 
-.. java:import:: io.searchbox.annotations JestId
-
 .. java:import:: lombok AccessLevel
 
 .. java:import:: lombok AllArgsConstructor
@@ -115,7 +113,7 @@ description
 id
 ^^
 
-.. java:field:: @Id @JestId @NotEmpty @Setter private String id
+.. java:field:: @Id @NotEmpty @Setter private String id
    :outertype: Instrument
 
    The id of the instrument which uniquely identifies the instrument in this application.

diff --git a/...urce/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/Customer.rst b/...urce/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/Customer.rst
@@ -4,7 +4,7 @@
 
 .. java:import:: javax.validation.constraints NotEmpty
 
-.. java:import:: io.swagger.annotations ApiModel
+.. java:import:: io.swagger.v3.oas.annotations.media Schema
 
 .. java:import:: lombok AllArgsConstructor
 
@@ -20,7 +20,7 @@ Customer
 .. java:package:: eu.dzhw.fdz.metadatamanagement.ordermanagement.domain
    :noindex:
 
-.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ApiModel public class Customer implements Serializable
+.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @Schema public class Customer implements Serializable
 
    Details of a customer who has ordered \ :java:ref:`Product`\ s.
 

diff --git a/.../source/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/Order.rst b/.../source/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/Order.rst
@@ -16,7 +16,7 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain Counter
 
-.. java:import:: io.swagger.annotations ApiModel
+.. java:import:: io.swagger.v3.oas.annotations.media Schema
 
 .. java:import:: lombok AllArgsConstructor
 
@@ -36,7 +36,7 @@ Order
 .. java:package:: eu.dzhw.fdz.metadatamanagement.ordermanagement.domain
    :noindex:
 
-.. java:type:: @Document @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder @ApiModel public class Order extends AbstractRdcDomainObject
+.. java:type:: @Document @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder @Schema public class Order extends AbstractRdcDomainObject
 
    Order (DTO) containing all relevant information of a \ :java:ref:`Customer`\  and her \ :java:ref:`Product`\ s.
 

diff --git a/...e/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/OrderClient.rst b/...e/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/OrderClient.rst
@@ -1,12 +1,12 @@
-.. java:import:: io.swagger.annotations ApiModel
+.. java:import:: io.swagger.v3.oas.annotations.media Schema
 
 OrderClient
 ===========
 
 .. java:package:: eu.dzhw.fdz.metadatamanagement.ordermanagement.domain
    :noindex:
 
-.. java:type:: @ApiModel public enum OrderClient
+.. java:type:: @Schema public enum OrderClient
 
    Enum holding possible clients with write access to the orders.
 

diff --git a/.../javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/OrderedStudy.rst b/.../javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/OrderedStudy.rst
@@ -8,7 +8,7 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.common.domain.validation I18nStringEntireNotEmpty
 
-.. java:import:: io.swagger.annotations ApiModel
+.. java:import:: io.swagger.v3.oas.annotations.media Schema
 
 .. java:import:: lombok Data
 
@@ -18,7 +18,7 @@ OrderedStudy
 .. java:package:: eu.dzhw.fdz.metadatamanagement.ordermanagement.domain
    :noindex:
 
-.. java:type:: @Data @ApiModel public class OrderedStudy implements Serializable
+.. java:type:: @Data @Schema public class OrderedStudy implements Serializable
 
    Partial \ :java:ref:`eu.dzhw.fdz.metadatamanagement.studymanagement.domain.Study`\  which is part of a \ :java:ref:`Product`\ . It is a copy of the \ :java:ref:`eu.dzhw.fdz.metadatamanagement.studymanagement.domain.Study`\  attributes which is made when the \ :java:ref:`Customer`\  places the orders.
 

diff --git a/...ource/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/Product.rst b/...ource/javadoc/eu/dzhw/fdz/metadatamanagement/ordermanagement/domain/Product.rst
@@ -10,7 +10,7 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.projectmanagement.domain DataAcquisitionProject
 
-.. java:import:: io.swagger.annotations ApiModel
+.. java:import:: io.swagger.v3.oas.annotations.media Schema
 
 .. java:import:: lombok AllArgsConstructor
 
@@ -26,7 +26,7 @@ Product
 .. java:package:: eu.dzhw.fdz.metadatamanagement.ordermanagement.domain
    :noindex:
 
-.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @ApiModel public class Product implements Serializable
+.. java:type:: @NoArgsConstructor @Data @AllArgsConstructor @Builder @Schema public class Product implements Serializable
 
    Data Product which can be ordered by a customer.
 

diff --git a/...e/javadoc/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain/Question.rst b/...e/javadoc/eu/dzhw/fdz/metadatamanagement/questionmanagement/domain/Question.rst
@@ -54,8 +54,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.variablemanagement.domain Variable
 
-.. java:import:: io.searchbox.annotations JestId
-
 .. java:import:: lombok AccessLevel
 
 .. java:import:: lombok AllArgsConstructor
@@ -119,7 +117,7 @@ dataAcquisitionProjectId
 id
 ^^
 
-.. java:field:: @Id @JestId @NotEmpty @Size @Setter private String id
+.. java:field:: @Id @NotEmpty @Size @Setter private String id
    :outertype: Question
 
    The id of the question which uniquely identifies the question in this application.

diff --git a/...z/metadatamanagement/relatedpublicationmanagement/domain/RelatedPublication.rst b/...z/metadatamanagement/relatedpublicationmanagement/domain/RelatedPublication.rst
@@ -48,8 +48,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.relatedpublicationmanagement.domain.validation VariableExists
 
-.. java:import:: io.searchbox.annotations JestId
-
 .. java:import:: lombok AllArgsConstructor
 
 .. java:import:: lombok Builder
@@ -111,7 +109,7 @@ doi
 id
 ^^
 
-.. java:field:: @Id @JestId @NotEmpty @Size @Pattern private String id
+.. java:field:: @Id @NotEmpty @Size @Pattern private String id
    :outertype: RelatedPublication
 
 instrumentIds

diff --git a/.../source/javadoc/eu/dzhw/fdz/metadatamanagement/studymanagement/domain/Study.rst b/.../source/javadoc/eu/dzhw/fdz/metadatamanagement/studymanagement/domain/Study.rst
@@ -50,9 +50,7 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.studymanagement.domain.validation ValidSurveyDesign
 
-.. java:import:: io.searchbox.annotations JestId
-
-.. java:import:: io.swagger.annotations ApiModel
+.. java:import:: io.swagger.v3.oas.annotations.media Schema
 
 .. java:import:: lombok AccessLevel
 
@@ -76,7 +74,7 @@ Study
 .. java:package:: eu.dzhw.fdz.metadatamanagement.studymanagement.domain
    :noindex:
 
-.. java:type:: @Entity @Document @ValidStudyId @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder @ApiModel @ValidShadowId public class Study extends AbstractShadowableRdcDomainObject implements StudySubDocumentProjection
+.. java:type:: @Entity @Document @ValidStudyId @EqualsAndHashCode @ToString @NoArgsConstructor @Data @AllArgsConstructor @Builder @Schema @ValidShadowId public class Study extends AbstractShadowableRdcDomainObject implements StudySubDocumentProjection
 
    A study contains all metadata of a \ :java:ref:`DataAcquisitionProject`\ . It will get a DOI (Digital Object Identifier) when the \ :java:ref:`DataAcquisitionProject`\  is released.
 
@@ -125,7 +123,7 @@ description
 id
 ^^
 
-.. java:field:: @Id @JestId @Setter @NotEmpty private String id
+.. java:field:: @Id @Setter @NotEmpty private String id
    :outertype: Study
 
    The id of the study which uniquely identifies the study in this application.

diff --git a/...ource/javadoc/eu/dzhw/fdz/metadatamanagement/surveymanagement/domain/Survey.rst b/...ource/javadoc/eu/dzhw/fdz/metadatamanagement/surveymanagement/domain/Survey.rst
@@ -52,8 +52,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.surveymanagement.domain.validation ValidUniqueSurveyNumber
 
-.. java:import:: io.searchbox.annotations JestId
-
 .. java:import:: lombok AccessLevel
 
 .. java:import:: lombok AllArgsConstructor
@@ -125,7 +123,7 @@ grossSampleSize
 id
 ^^
 
-.. java:field:: @Id @JestId @Setter private String id
+.. java:field:: @Id @Setter private String id
    :outertype: Survey
 
    The id of the survey which uniquely identifies the survey in this application.

diff --git a/...e/javadoc/eu/dzhw/fdz/metadatamanagement/variablemanagement/domain/Variable.rst b/...e/javadoc/eu/dzhw/fdz/metadatamanagement/variablemanagement/domain/Variable.rst
@@ -88,8 +88,6 @@
 
 .. java:import:: eu.dzhw.fdz.metadatamanagement.variablemanagement.domain.validation ValidVariableIdName
 
-.. java:import:: io.searchbox.annotations JestId
-
 .. java:import:: lombok AccessLevel
 
 .. java:import:: lombok AllArgsConstructor
@@ -209,7 +207,7 @@ generationDetails
 id
 ^^
 
-.. java:field:: @Id @JestId @Setter private String id
+.. java:field:: @Id @Setter private String id
    :outertype: Variable
 
    The id of the variable which uniquely identifies the variable in this application. The id must not be empty and must be of the form var-{{dataAcquisitionProjectId}}-ds{{dataSetNumber}}-{{name}}$. The id must not contain more than 512 characters.