Merge pull request SORMAS-Foundation#3758 from hzi-braunschweig/3754-fix-swagger.json

SORMAS-Foundation#3754 fix ExternalVisitsResource not being added to generated swagger doc

Author: FredrikSchaefer

README.md

@@ -28,7 +28,7 @@ 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/visits-external/openapi.json`` or ``<<host>>/sormas-rest/visits-external/openapi.yaml``
+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>
 

sormas-rest/pom.xml

@@ -122,6 +122,7 @@
 					<!-- Swagger Generation Config -->
 					<resourcePackages>
 						<resourcePackage>de.symeda.sormas.rest</resourcePackage>
+						<resourcePackage>de.symeda.sormas.rest.external</resourcePackage>
 						<resourcePackage>de.symeda.sormas.rest.swagger</resourcePackage>
 					</resourcePackages>
 					<outputDirectory>${basedir}/target/</outputDirectory>

sormas-rest/src/main/java/de/symeda/sormas/rest/external/ExternalRestResourceConfig.java

@@ -21,7 +21,7 @@
  * Resource configuration used only for external resources i.e. for external systems which communicate with SORMAS
  * Separate from the other resource configuration in order to limit create the swagger documentation only for resources in this package
  */
-@ApplicationPath("/visits-external")
+@ApplicationPath("/")
 public class ExternalRestResourceConfig extends ResourceConfig {
 
 	@Context

sormas-rest/src/main/java/de/symeda/sormas/rest/external/ExternalVisitsResource.java

@@ -25,7 +25,7 @@
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 
-@Path("/")
+@Path("/visits-external")
 @Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
 @Consumes(MediaType.APPLICATION_JSON + "; charset=UTF-8")
 @RolesAllowed("REST_EXTERNAL_VISITS_USER")