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 2021/03/09 16:29:25 UTC
[isis] branch master updated: ISIS-2572: RO/Swagger: fixes
generated schema and ui links
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 a4fcd83 ISIS-2572: RO/Swagger: fixes generated schema and ui links
a4fcd83 is described below
commit a4fcd83808641e066b7206988516d98583fc907a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Mar 9 17:29:10 2021 +0100
ISIS-2572: RO/Swagger: fixes generated schema and ui links
---
.../jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java | 2 +-
.../rendering/service/swagger/SwaggerServiceMenu.java | 3 ++-
.../rendering/service/swagger/internal/Generation.java | 10 +++++-----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index c25281f..77efb47 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -55,7 +55,7 @@ import lombok.val;
*
*/
@Service
-@Named("isis.viewer.ro.WebModuleJaxrsRestEasy4")
+@Named("isis.viewer.ro.WebModuleJaxrsRestEasy4") // CAUTION: SwaggerServiceMenu refers to this name
@Order(OrderPrecedence.MIDPOINT - 80)
@Qualifier("JaxrsRestEasy4")
public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
index c4c3040..13f5cbb 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceMenu.java
@@ -143,7 +143,8 @@ public class SwaggerServiceMenu {
// -- HELPER
private String disableReasonWhenRequiresROViewer() {
- final Optional<?> moduleIfAny = serviceRegistry.lookupBeanById("isisRoViewer.WebModuleJaxrsRestEasy4");
+ final Optional<?> moduleIfAny = serviceRegistry
+ .lookupBeanById("isis.viewer.ro.WebModuleJaxrsRestEasy4");
return moduleIfAny.isPresent()
? null
: "RestfulObjects viewer is not configured";
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index cf69371..39394a9 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -398,7 +398,7 @@ class Generation {
operation
.response(200,
newResponse(Caching.TRANSACTIONAL)
- .description(objectType + " , if Accept: application/json;profile=urn:org.apache.isis/v1")
+ .description(objectType + " , if Accept: application/json;profile=urn:org.apache.isis/v2")
.schema(newRefProperty(isisModelDefinition)));
final ModelImpl isisModel = new ModelImpl();
@@ -503,7 +503,7 @@ class Generation {
invokeOperation
.response(
200, new Response()
- .description(serviceId + "#" + actionId + " , if Accept: application/json;profile=urn:org.apache.isis/v1")
+ .description(serviceId + "#" + actionId + " , if Accept: application/json;profile=urn:org.apache.isis/v2")
.schema(actionReturnTypeFor(serviceAction))
);
}
@@ -532,7 +532,7 @@ class Generation {
collectionOperation
.response(
200, new Response()
- .description(objectType + "#" + collectionId + " , if Accept: application/json;profile=urn:org.apache.isis/v1")
+ .description(objectType + "#" + collectionId + " , if Accept: application/json;profile=urn:org.apache.isis/v2")
.schema(modelFor(collection))
);
}
@@ -846,8 +846,8 @@ class Generation {
if(supportsV1) {
operation = operation
- .produces("application/json;profile=" + DQ + "urn:org.apache.isis/v1" + DQ)
- .produces("application/json;profile=" + DQ + "urn:org.apache.isis/v1;suppress=all" + DQ);
+ .produces("application/json;profile=" + DQ + "urn:org.apache.isis/v2" + DQ)
+ .produces("application/json;profile=" + DQ + "urn:org.apache.isis/v2;suppress=all" + DQ);
}
return operation;