You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/08/30 15:34:18 UTC
[isis] branch master updated: ISIS-1895: fix missing slash prefix
in swagger base url
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new cead9cd ISIS-1895: fix missing slash prefix in swagger base url
cead9cd is described below
commit cead9cd65036bcd1e67ada515ebe0a56a9fb0769
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 30 17:34:13 2018 +0200
ISIS-1895: fix missing slash prefix in swagger base url
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../isis/core/metamodel/services/swagger/SwaggerServiceDefault.java | 4 +++-
.../src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java | 2 +-
.../java/org/apache/isis/core/webapp/IsisWebAppContextListener.java | 1 -
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
index 4462911..c63bd6b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.core.metamodel.services.swagger;
+import static org.apache.isis.commons.internal.base._Strings.prefix;
+
import java.util.Map;
import javax.annotation.PostConstruct;
@@ -49,7 +51,7 @@ public class SwaggerServiceDefault implements SwaggerService {
final String restfulPath = _Resource.getRestfulPathOrThrow();
- this.basePath = _Resource.prependContextPathIfPresent(restfulPath);
+ this.basePath = prefix(_Resource.prependContextPathIfPresent(restfulPath), "/");
}
@Programmatic
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
index 7c2383a..1c7e03f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
@@ -69,7 +69,7 @@ import org.apache.isis.core.webapp.content.ResourceCachingFilter;
@WebInitParam(
name="whenNoSession", // what to do if no session was found ...
value="auto"), // ... 401 and a basic authentication challenge if request originates from web browser
- @WebInitParam(name="passThru", value="/restful/swagger")
+ @WebInitParam(name="passThru", value="/restful/swagger") //TODO[ISIS-1895] the restful path is configured elsewhere
})
public class IsisSessionFilter implements Filter {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
index 8856bc6..0f41369 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppContextListener.java
@@ -70,7 +70,6 @@ public class IsisWebAppContextListener implements ServletContextListener {
IsisWebAppConfigProvider.register(configProvider);
// phase 1 - setting up context specific properties before bootstrapping
-
putContextPathIfPresent(servletContext.getContextPath());
final List<WebModule> webModules =