You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/12/10 09:00:08 UTC
[3/4] isis git commit: ISIS-1237: removing the action prompt paths
ISIS-1237: removing the action prompt paths
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6daa442d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6daa442d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6daa442d
Branch: refs/heads/ISIS-1237
Commit: 6daa442dc1515b451f705ca978e03654e3a61f96
Parents: f9a0b43
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 9 18:58:00 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 9 18:58:00 2015 +0000
----------------------------------------------------------------------
.../swagger/internal/SwaggerSpecGenerator.java | 51 +-------------------
1 file changed, 1 insertion(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6daa442d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/SwaggerSpecGenerator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
index 07673d3..bfb1489 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
@@ -99,10 +99,6 @@ public class SwaggerSpecGenerator {
for (final ObjectAction serviceAction : serviceActions) {
appendActionTo(serviceMembers, serviceAction);
- if(false) {
- appendPromptPaths(swagger, serviceAction);
- }
-
appendInvokePath(swagger, serviceAction);
}
}
@@ -299,51 +295,6 @@ public class SwaggerSpecGenerator {
return serviceMembers;
}
- void appendPromptPaths(
- final Swagger swagger,
- final ObjectAction serviceAction) {
-
- final ObjectSpecification serviceSpec = serviceAction.getOnType();
- final String serviceId = serviceIdFor(serviceSpec);
- final String servicePathStr = "/services/" + serviceId;
- final String serviceActionId = serviceAction.getId();
- final String serviceActionPromptPathRelStr = "actions/" + serviceActionId;
-
- final ObjectProperty actionParametersRepr = new ObjectProperty();
- swagger.path(servicePathStr + "/" + serviceActionPromptPathRelStr,
- new Path()
- .get(
- new Operation()
- .tag(serviceId)
- .description(roSpec("18.1") + ": (prompt) resource for " + serviceId + "#" + serviceActionId)
- .produces("application/json")
- .produces("application/json;profile=urn:org.restfulobjects:repr-types/object-action")
- .response(200,
- new Response()
- .description(roSpec("18.2") + ": (prompt) representation of " + serviceId + "#" + serviceActionId)
- .schema(new ObjectProperty()
- .property("id",
- stringPropertyEnum(serviceActionId))
- .property("memberType",
- stringPropertyEnum("action"))
- .property("links", arrayOfLinksGetOnly())
- .property("parameters", actionParametersRepr)
- ))));
- final List<ObjectActionParameter> parameters = serviceAction.getParameters();
-
- int i = 0;
- for (final ObjectActionParameter parameter : parameters) {
- final String parameterId = parameter.getId();
- actionParametersRepr.property(parameterId,
- new ObjectProperty()
- .property("num", new IntegerProperty()._default(i++))
- .property("id", stringPropertyEnum(parameterId))
- .property("name", stringPropertyEnum(parameter.getName()))
- .property("description", stringPropertyEnum(parameter.getDescription()))
- );
- }
- }
-
void appendInvokePath(
final Swagger swagger,
final ObjectAction serviceAction) {
@@ -400,7 +351,7 @@ public class SwaggerSpecGenerator {
for (final ObjectActionParameter parameter : parameters) {
final Property valueProperty;
- // TODO: need to switch on parameter's type and create appopriate impl of valueProperty
+ // TODO: need to switch on parameter's type and create appropriate impl of valueProperty
// if(parameter.getSpecification().isValue()) ...
valueProperty = stringProperty();