You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2018/01/25 15:04:31 UTC
nifi git commit: NIFI-4801 Fixes Swagger spec for uploadTemplate.
This closes #2428
Repository: nifi
Updated Branches:
refs/heads/master 37271e824 -> c4e2ac7cd
NIFI-4801 Fixes Swagger spec for uploadTemplate. This closes #2428
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c4e2ac7c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c4e2ac7c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c4e2ac7c
Branch: refs/heads/master
Commit: c4e2ac7cda45591d357519217687aa7979bae8fb
Parents: 37271e8
Author: Kevin Doran <kd...@apache.org>
Authored: Tue Jan 23 09:59:58 2018 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jan 25 10:02:56 2018 -0500
----------------------------------------------------------------------
.../web/api/entity/CreateTemplateRequestEntity.java | 2 +-
.../org/apache/nifi/web/api/ProcessGroupResource.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/c4e2ac7c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CreateTemplateRequestEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CreateTemplateRequestEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CreateTemplateRequestEntity.java
index 1e0ffb3..f6836b9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CreateTemplateRequestEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CreateTemplateRequestEntity.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
/**
* A serialized representation of this class can be placed in the entity body of a request to the API.
*/
-@XmlRootElement(name = "copySnippetRequestEntity")
+@XmlRootElement(name = "createTemplateRequestEntity")
public class CreateTemplateRequestEntity extends Entity {
private String name;
http://git-wip-us.apache.org/repos/asf/nifi/blob/c4e2ac7c/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
index b9840f1..7c93220 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
@@ -17,6 +17,8 @@
package org.apache.nifi.web.api;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
@@ -3351,6 +3353,16 @@ public class ProcessGroupResource extends ApplicationResource {
@Authorization(value = "Write - /process-groups/{uuid}")
}
)
+ @ApiImplicitParams(
+ value = {
+ @ApiImplicitParam(
+ name = "template",
+ value = "The binary content of the template file being uploaded.",
+ required = true,
+ type = "file",
+ paramType = "formData")
+ }
+ )
@ApiResponses(
value = {
@ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),