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/09/05 10:01:58 UTC
[isis] branch master updated: ISIS-1895: fix SwaggerServiceDefault
throws on initialization for tests
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 6704695 ISIS-1895: fix SwaggerServiceDefault throws on initialization for tests
6704695 is described below
commit 67046955d1a35401f662940baf3ab7b4dc55d173
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Sep 5 12:01:19 2018 +0200
ISIS-1895: fix SwaggerServiceDefault throws on initialization for tests
when headless bootstrapping restful path is not a requirement
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../core/metamodel/services/swagger/SwaggerServiceDefault.java | 8 +++++---
1 file changed, 5 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 c63bd6b..7764a26 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
@@ -19,6 +19,9 @@
package org.apache.isis.core.metamodel.services.swagger;
import static org.apache.isis.commons.internal.base._Strings.prefix;
+import static org.apache.isis.commons.internal.base._With.ifPresentElse;
+import static org.apache.isis.commons.internal.resources._Resource.getRestfulPathIfAny;
+import static org.apache.isis.commons.internal.resources._Resource.prependContextPathIfPresent;
import java.util.Map;
@@ -31,7 +34,6 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.commons.internal.resources._Resource;
import org.apache.isis.core.metamodel.services.swagger.internal.SwaggerSpecGenerator;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -49,9 +51,9 @@ public class SwaggerServiceDefault implements SwaggerService {
@PostConstruct
public void init(final Map<String,String> properties) {
- final String restfulPath = _Resource.getRestfulPathOrThrow();
+ final String restfulPath = ifPresentElse(getRestfulPathIfAny(), "undefined");
- this.basePath = prefix(_Resource.prependContextPathIfPresent(restfulPath), "/");
+ this.basePath = prefix(prependContextPathIfPresent(restfulPath), "/");
}
@Programmatic