From: Jan Hajnar Date: Wed, 1 Jul 2015 09:03:44 +0000 (+0200) Subject: Bug 3887 - Autogenerated API documentation doesn't show application/xml X-Git-Tag: release/beryllium~410 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=8b4e82dfef2a4fe1195909890a81aa6ac1cf111b;ds=sidebyside Bug 3887 - Autogenerated API documentation doesn't show application/xml as an option for RPC operations * added xml input option for rpcs, put and post methods Change-Id: I1f73bcb7d1127e4b4324d779aec40907ca627073 Signed-off-by: Jan Hajnar (cherry picked from commit e57d9461b79dedd8ef9edf8f249b066540fd0e9d) --- diff --git a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java index c86b89c004..c40eca0051 100644 --- a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java +++ b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/impl/BaseYangSwaggerGenerator.java @@ -372,6 +372,7 @@ public class BaseYangSwaggerGenerator { payload.setParamType("body"); payload.setType("(" + rpcDefn.getQName().getLocalName() + ")input"); operationSpec.setParameters(Collections.singletonList(payload)); + operationSpec.setConsumes(OperationBuilder.CONSUMES_PUT_POST); } rpc.setOperations(Arrays.asList(operationSpec)); diff --git a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/model/builder/OperationBuilder.java b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/model/builder/OperationBuilder.java index 38c5f7264a..88ca3bcd01 100644 --- a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/model/builder/OperationBuilder.java +++ b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/model/builder/OperationBuilder.java @@ -21,6 +21,12 @@ public final class OperationBuilder { public static final String OPERATIONAL = "(operational)"; public static final String CONFIG = "(config)"; + public static final List CONSUMES_PUT_POST = new ArrayList<>(); + static { + CONSUMES_PUT_POST.add("application/json"); + CONSUMES_PUT_POST.add("application/xml"); + } + public static class Get { protected Operation spec; @@ -57,6 +63,7 @@ public final class OperationBuilder { spec = new Operation(); spec.setType(CONFIG + nodeName); spec.setNotes(description); + spec.setConsumes(CONSUMES_PUT_POST); } public Put pathParams(List params) { @@ -85,6 +92,7 @@ public final class OperationBuilder { super(nodeName, description); this.dataNodeContainer = dataNodeContainer; spec.setType(CONFIG + nodeName + METHOD_NAME); + spec.setConsumes(CONSUMES_PUT_POST); } @Override