diff --git a/CHANGELOG.md b/CHANGELOG.md index 2594bd228..51b940f4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ * [Changelog](#changelog) - * [[1.3.1]](#131) + * [[1.3.2]](#132) * [Fixed](#fixed) + * [[1.3.1]](#131) + * [Fixed](#fixed-1) * [[1.3.0] - Dizzy Diamond](#130---dizzy-diamond-) * [Changes and new features](#changes-and-new-features) * [Fixed or optimized](#fixed-or-optimized) @@ -19,9 +21,9 @@ * [Changes and new features](#changes-and-new-features-1) * [Fixed or optimized](#fixed-or-optimized-5) * [[1.2.2]](#122) - * [Fixed](#fixed-1) - * [[1.2.1]](#121) * [Fixed](#fixed-2) + * [[1.2.1]](#121) + * [Fixed](#fixed-3) * [[1.2.0] - Caramelized Crystal](#120---caramelized-crystal) * [Highlight](#highlight-1) * [Changes and new features](#changes-and-new-features-2) @@ -55,13 +57,13 @@ * [Added or changed](#added-or-changed-1) * [Fixed or optimized](#fixed-or-optimized-14) * [[1.0.0-rc+4.1] - 2022-07-13](#100-rc41---2022-07-13) - * [Fixed](#fixed-3) + * [Fixed](#fixed-4) * [[1.0.0-rc+4] - 2022-06-13](#100-rc4---2022-06-13) * [Added or changed](#added-or-changed-2) - * [Fixed](#fixed-4) + * [Fixed](#fixed-5) * [[1.0.0-rc+3] - 2022-05-05](#100-rc3---2022-05-05) * [Added or changed](#added-or-changed-3) - * [Fixed](#fixed-5) + * [Fixed](#fixed-6) * [[1.0.0-rc+2] - 2022-01-23](#100-rc2---2022-01-23) * [Added](#added) * [Added in pre-production](#added-in-pre-production) @@ -77,15 +79,15 @@ * [Major bugs identified](#major-bugs-identified) * [[1.0.0-beta+2.1] - 2021-07-27](#100-beta21---2021-07-27) * [Added](#added-3) - * [Fixed](#fixed-6) + * [Fixed](#fixed-7) * [[1.0.0-beta+2] - 2021-05-07](#100-beta2---2021-05-07) * [Added](#added-4) * [Changed](#changed-1) * [[1.0.0-beta+1] - 2021-04-27](#100-beta1---2021-04-27) - * [Fixed](#fixed-7) + * [Fixed](#fixed-8) * [[1.0.0-beta] - 2021-04-20](#100-beta---2021-04-20) * [Added](#added-5) - * [Fixed](#fixed-8) + * [Fixed](#fixed-9) * [[1.0.0-alpha] - 2020-11-30](#100-alpha---2020-11-30) * [Added](#added-6) @@ -97,6 +99,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [1.3.2] + +### Fixed + +- (!1260) Fixed the link to swagger for the specific case where a "/" is at the end of server uri in the config file. + + ## [1.3.1] ### Fixed diff --git a/opensilex-core/src/main/java/org/opensilex/core/system/api/SystemAPI.java b/opensilex-core/src/main/java/org/opensilex/core/system/api/SystemAPI.java index c122df379..0525a1ae8 100644 --- a/opensilex-core/src/main/java/org/opensilex/core/system/api/SystemAPI.java +++ b/opensilex-core/src/main/java/org/opensilex/core/system/api/SystemAPI.java @@ -17,6 +17,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; import java.util.List; import java.util.Properties; import org.opensilex.OpenSilex; @@ -106,8 +107,9 @@ public Response getVersionInfo() throws Exception { versionInfoDTO.setApiDocs( new ApiExternalDocsDTO( "Opensilex API documentation", - this.serverModule.getBaseURL() + "/api-docs" + UriBuilder.fromPath(this.serverModule.getBaseURL()).path("/api-docs/").build().toString() ) + ); versionInfoDTO.setGithubPage(