[GITFLOW]merging 'release-1.53.0' into 'master'

Author: jenkins

.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+env:
+  java: 11
+
+on:
+  push:
+    branches: [ development, master ]
+  pull_request:
+    branches: [ development ]
+
+jobs:
+  test:
+    name: mvn verify
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up JDK ${{ env.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ env.java }}
+
+      - name: Cache Maven packages
+        # FIXME(@JonasCir) #3733 remove '**/*.pom' once serverlib pom is renamed
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-java-${{ env.java }}-m2-${{ hashFiles('**/pom.xml', '**/*.pom') }}
+          restore-keys: ${{ runner.os }}-java-${{ env.java }}-m2
+
+      - name: Run mvn verify
+        # FIXME(@JonasCir) see https://github.com/hzi-braunschweig/SORMAS-Project/issues/3730#issuecomment-745165678
+        working-directory: ./sormas-base
+        run: mvn verify -B -ntp

.travis.yml

@@ -110,6 +110,18 @@ The GitHub project has been configured to **automatically** move issues that are
 The Development Team is responsible to keep the tickets up to date on this board and to assign the appropriate milestone in which the work is going to be released.
 
 
+### Managing dependencies
+
+For managing Java libraries as dependencies, they are managed by Maven and listed in *sormas-base/pom.xml*.  The purpose of a centralized management is to have an overview of the used libraries and adjust for new versions.
+
+1. **Payara modules**: Provided by Payara in *{payara-home}/glassfish/modules* and used in that version by other libs.
+2. **Domain libs**: Provided in Payara domain under *{payara-domain}/lib* to be usable by deployed artifacts (ear, war). They have to be listed in *sormas-base/dependencies/serverlibs.pom*. Usually for helper libraries that several artifacts need.
+3. **Compile dependencies**: Bundled in respective artifacts who need the dependency explicitly. Usually for dependencies singularly needed in one artifact.
+4. **Test libraries**: Libraries used in automated tests in one or more modules.
+
+Due to the separate build management tool Gradle for *sormas-app*, there exists a redundant listing of compile dependencies in *sormas-app/app/build.gradle*.
+
+
 ### Eclipse Troubleshooting
 
 Unfortunatley, when using eclipse together with the Payara Tools, there are a number of deployment problems that you might run into. Examples of these include:

CONTRIBUTING.md

@@ -22,7 +22,7 @@
   - **Windows**: For testing and development environments we suggest to download and run the installer of the Java 11 **JDK** for 32 or 64 bit client systems (depending on your system).
 
 ## Eclipse
-- Install the latest Eclipse version
+- Install the latest Eclipse version, best fit is [Eclipse IDE for Enterprise Java Developers](https://www.eclipse.org/downloads/packages).
 - Set the default JRE of Eclipse to the installed Zulu Java SDK: [Assigning the default JRE for the workbench ](https://help.eclipse.org/kepler/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Ftasks%2Ftask-assign_default_jre.htm)
 - Clone the SORMAS-Open repository and import the projects to Eclipse
 	- If you're using Eclipse to clone, choose "File -> Import -> Git -> Projects from Git" and continue until you're asked to create a new project from the cloned repository; click cancel instead and use "File -> Import -> Maven -> Existing Maven Projects" to import the separate projects into your workspace
@@ -51,7 +51,7 @@
 - Clone the SORMAS-Project repository and open the project in IntelliJ
 	- make sure the under "File -> Project Structure -> Modules" all the modules (except the android app - this should not be added) are recognized, if not add the modules with +
 - Make sure under "File -> Settings -> Plugins" Glassfish & Ant integrations are enabled (look into the "Installed" tab)
-- Install the Vaadin Designer plugin
+- Install the Vaadin plugin (not the Vaadin Designer plugin!)
 - Make a copy of "build.properties.example" contained in "sormas-base", rename it to "build.properties" and set "glassfish.domain.root" to the location of the sormas domain located in the "glassfish/domains" folder inside your payara installation
 - Run "Maven install" on the sormas-base project
 - Add a Payara server to IntelliJ:

DEVELOPMENT_ENVIRONMENT.md

@@ -7,7 +7,7 @@
     />
   </a>
   <br/>
-  <a href="https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-GPL%20v3-blue"/></a> <a href="https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest"><img alt="Latest Release" src="https://img.shields.io/github/v/release/hzi-braunschweig/SORMAS-Project"/></a> <img alt="Development Build Status" src="https://travis-ci.com/hzi-braunschweig/SORMAS-Project.svg?branch=development"/> <a href="https://gitter.im/SORMAS-Project"><img alt="Gitter" src="https://badges.gitter.im/SORMAS-Project/dev-support.svg"/></a>
+  <a href="https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-GPL%20v3-blue"/></a> <a href="https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest"><img alt="Latest Release" src="https://img.shields.io/github/v/release/hzi-braunschweig/SORMAS-Project"/></a> <img alt="Development Build Status" src="https://github.com/hzi-braunschweig/SORMAS-Project/workflows/Java%20CI%20with%20Maven/badge.svg?branch=development"/> <a href="https://gitter.im/SORMAS-Project"><img alt="Gitter" src="https://badges.gitter.im/SORMAS-Project/dev-support.svg"/></a>
 </p>
 <br/>
 
@@ -27,6 +27,8 @@ SORMAS officially supports and is tested on **Chromium-based browsers** (like Go
 
 #### Is there a ReST API documentation?
 Yes! Please download the [latest release](https://github.com/hzi-braunschweig/SORMAS-Project/releases/latest) and copy the content of /deploy/openapi/sormas-rest.yaml to an editor that generates a visual API documentation (e.g. https://editor.swagger.io/).
+<br/>
+Runtime Swagger documentation of the External Visits Resource (used by external symptom journals such as CLIMEDO or PIA) is also available at ``<<host>>/sormas-rest/openapi.json`` or ``<<host>>/sormas-rest/openapi.yaml``
 
 <p align="center"><img src="https://user-images.githubusercontent.com/23701005/74659600-ebb8fc00-5194-11ea-836b-a7ca9d682301.png"/></p>
 

README.md

@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>de.symeda.sormas</groupId>
 		<artifactId>sormas-base</artifactId>
-		<version>1.52.1</version>
+		<version>1.53.0</version>
 		<relativePath>../sormas-base</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -67,6 +67,11 @@
 			<artifactId>simmetrics-core</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+		</dependency>
+
 	</dependencies>
 
 </project>

sormas-api/pom.xml

@@ -39,14 +39,11 @@ public class AuthProvider {
 
     private final boolean isUsernameCaseSensitive;
 
-    private final boolean isEmailRequired;
-
     private final boolean isDefaultProvider;
 
     private AuthProvider() {
         String configuredProvider = FacadeProvider.getConfigFacade().getAuthenticationProvider();
         isUsernameCaseSensitive = SORMAS.equalsIgnoreCase(configuredProvider);
-        isEmailRequired = KEYCLOAK.equalsIgnoreCase(configuredProvider);
         isDefaultProvider = SORMAS.equalsIgnoreCase(configuredProvider);
     }
 
@@ -68,13 +65,6 @@ public boolean isUsernameCaseSensitive() {
         return isUsernameCaseSensitive;
     }
 
-    /**
-     * Authentication Provider requires emails to be required or optional.
-     */
-    public boolean isEmailRequired() {
-        return isEmailRequired;
-    }
-
     /**
      * Current Authentication Provider is the SORMAS default one.
      */

sormas-api/src/main/java/de/symeda/sormas/api/AuthProvider.java

@@ -0,0 +1,18 @@
+package de.symeda.sormas.api.campaign;
+
+import de.symeda.sormas.api.IntegerRange;
+import de.symeda.sormas.api.i18n.I18nProperties;
+
+/**
+ * Not used yet
+ */
+public enum CampaignPhase {
+
+	PRE,
+	INTRA,
+	POST;
+
+	public String toString() {
+		return I18nProperties.getEnumCaption(this);
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignPhase.java

@@ -15,22 +15,24 @@
 
 package de.symeda.sormas.api.campaign.data;
 
+import java.io.Serializable;
+import java.util.Date;
+
 import de.symeda.sormas.api.BaseCriteria;
 import de.symeda.sormas.api.campaign.CampaignReferenceDto;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaReferenceDto;
 import de.symeda.sormas.api.region.CommunityReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
 
-import java.io.Serializable;
-
 public class CampaignFormDataCriteria extends BaseCriteria implements Serializable {
 
 	public static final String CAMPAIGN = "campaign";
 	public static final String CAMPAIGN_FORM_META = "campaignFormMeta";
 	public static final String REGION = "region";
 	public static final String DISTRICT = "district";
 	public static final String COMMUNITY = "community";
+	public static final String FORM_DATE = "formDate";
 
 	private static final long serialVersionUID = 8124072093160133408L;
 
@@ -39,6 +41,7 @@ public class CampaignFormDataCriteria extends BaseCriteria implements Serializab
 	private RegionReferenceDto region;
 	private DistrictReferenceDto district;
 	private CommunityReferenceDto community;
+	private Date formDate;
 
 	public CampaignReferenceDto getCampaign() {
 		return campaign;
@@ -104,4 +107,17 @@ public CampaignFormDataCriteria community(CommunityReferenceDto community) {
 		this.community = community;
 		return this;
 	}
+
+	public Date getFormDate() {
+		return formDate;
+	}
+
+	public void setFormDate(Date formDate) {
+		this.formDate = formDate;
+	}
+
+	public CampaignFormDataCriteria formDate(Date formDate) {
+		this.formDate = formDate;
+		return this;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/campaign/data/CampaignFormDataCriteria.java

@@ -45,6 +45,7 @@ public class CampaignFormDataDto extends EntityDto {
 	public static final String REGION = "region";
 	public static final String DISTRICT = "district";
 	public static final String COMMUNITY = "community";
+	public static final String CREATING_USER = "creatingUser";
 
 	private List<CampaignFormDataEntry> formValues;
 	private CampaignReferenceDto campaign;
@@ -144,5 +145,4 @@ public void setCreatingUser(UserReferenceDto creatingUser) {
 		this.creatingUser = creatingUser;
 	}
 
-
 }