Repository: nifi Updated Branches: refs/heads/master 58e4fb576 -> e773fa551
http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.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/LabelResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java index 2816d25..d34eb74 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; @@ -102,7 +102,7 @@ public class LabelResource extends ApplicationResource { value = "Gets a label", response = LabelEntity.class, authorizations = { - @Authorization(value = "Read - /labels/{uuid}", type = "") + @Authorization(value = "Read - /labels/{uuid}") } ) @ApiResponses( @@ -154,7 +154,7 @@ public class LabelResource extends ApplicationResource { value = "Updates a label", response = LabelEntity.class, authorizations = { - @Authorization(value = "Write - /labels/{uuid}", type = "") + @Authorization(value = "Write - /labels/{uuid}") } ) @ApiResponses( @@ -244,8 +244,8 @@ public class LabelResource extends ApplicationResource { value = "Deletes a label", response = LabelEntity.class, authorizations = { - @Authorization(value = "Write - /labels/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /labels/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.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/OutputPortResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java index 0c49b0a..bccca57 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; @@ -102,7 +102,7 @@ public class OutputPortResource extends ApplicationResource { value = "Gets an output port", response = PortEntity.class, authorizations = { - @Authorization(value = "Read - /output-ports/{uuid}", type = "") + @Authorization(value = "Read - /output-ports/{uuid}") } ) @ApiResponses( @@ -154,7 +154,7 @@ public class OutputPortResource extends ApplicationResource { value = "Updates an output port", response = PortEntity.class, authorizations = { - @Authorization(value = "Write - /output-ports/{uuid}", type = "") + @Authorization(value = "Write - /output-ports/{uuid}") } ) @ApiResponses( @@ -244,8 +244,8 @@ public class OutputPortResource extends ApplicationResource { value = "Deletes an output port", response = PortEntity.class, authorizations = { - @Authorization(value = "Write - /output-ports/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /output-ports/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/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 57b76c4..de1f15b 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 @@ -19,12 +19,12 @@ package org.apache.nifi.web.api; import com.sun.jersey.api.core.ResourceContext; import com.sun.jersey.core.util.MultivaluedMapImpl; import com.sun.jersey.multipart.FormDataParam; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.AuthorizableLookup; import org.apache.nifi.authorization.AuthorizeAccess; @@ -257,7 +257,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets a process group", response = ProcessGroupEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -312,7 +312,7 @@ public class ProcessGroupResource extends ApplicationResource { response = VariableRegistryEntity.class, notes = NON_GUARANTEED_ENDPOINT, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") }) @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."), @@ -356,7 +356,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Updates a process group", response = ProcessGroupEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -436,7 +436,7 @@ public class ProcessGroupResource extends ApplicationResource { response = VariableRegistryUpdateRequestEntity.class, notes = NON_GUARANTEED_ENDPOINT, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") }) @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."), @@ -490,7 +490,7 @@ public class ProcessGroupResource extends ApplicationResource { response = VariableRegistryUpdateRequestEntity.class, notes = NON_GUARANTEED_ENDPOINT, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") }) @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."), @@ -544,7 +544,7 @@ public class ProcessGroupResource extends ApplicationResource { @Produces(MediaType.APPLICATION_JSON) @Path("{id}/variable-registry") @ApiOperation(value = "Updates the contents of a Process Group's variable Registry", response = VariableRegistryEntity.class, notes = NON_GUARANTEED_ENDPOINT, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") }) @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."), @@ -612,7 +612,7 @@ public class ProcessGroupResource extends ApplicationResource { response = VariableRegistryUpdateRequestEntity.class, notes = NON_GUARANTEED_ENDPOINT, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") }) @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."), @@ -1438,10 +1438,10 @@ public class ProcessGroupResource extends ApplicationResource { value = "Deletes a process group", response = ProcessGroupEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = ""), - @Authorization(value = "Read - any referenced Controller Services by any encapsulated components - /controller-services/{uuid}", type = ""), - @Authorization(value = "Write - /{component-type}/{uuid} - For all encapsulated components", type = "") + @Authorization(value = "Write - /process-groups/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}"), + @Authorization(value = "Read - any referenced Controller Services by any encapsulated components - /controller-services/{uuid}"), + @Authorization(value = "Write - /{component-type}/{uuid} - For all encapsulated components") } ) @ApiResponses( @@ -1526,7 +1526,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a process group", response = ProcessGroupEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -1616,7 +1616,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all process groups", response = ProcessGroupsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -1683,9 +1683,9 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a new processor", response = ProcessorEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = ""), - @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}", type = ""), - @Authorization(value = "Write - if the Processor is restricted - /restricted-components", type = "") + @Authorization(value = "Write - /process-groups/{uuid}"), + @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}"), + @Authorization(value = "Write - if the Processor is restricted - /restricted-components") } ) @ApiResponses( @@ -1803,7 +1803,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all processors", response = ProcessorsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -1864,7 +1864,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates an input port", response = PortEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -1953,7 +1953,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all input ports", response = InputPortsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -2012,7 +2012,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates an output port", response = PortEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -2101,7 +2101,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all output ports", response = OutputPortsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -2161,7 +2161,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a funnel", response = FunnelEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -2250,7 +2250,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all funnels", response = FunnelsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -2310,7 +2310,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a label", response = LabelEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -2399,7 +2399,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all labels", response = LabelsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -2459,7 +2459,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a new process group", response = RemoteProcessGroupEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -2563,7 +2563,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all remote process groups", response = RemoteProcessGroupsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -2630,9 +2630,9 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a connection", response = ConnectionEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = ""), - @Authorization(value = "Write Source - /{component-type}/{uuid}", type = ""), - @Authorization(value = "Write Destination - /{component-type}/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}"), + @Authorization(value = "Write Source - /{component-type}/{uuid}"), + @Authorization(value = "Write Destination - /{component-type}/{uuid}") } ) @ApiResponses( @@ -2791,7 +2791,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Gets all connections", response = ConnectionsEntity.class, authorizations = { - @Authorization(value = "Read - /process-groups/{uuid}", type = "") + @Authorization(value = "Read - /process-groups/{uuid}") } ) @ApiResponses( @@ -2854,9 +2854,9 @@ public class ProcessGroupResource extends ApplicationResource { value = "Copies a snippet and discards it.", response = FlowEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = ""), - @Authorization(value = "Read - /{component-type}/{uuid} - For each component in the snippet and their descendant components", type = ""), - @Authorization(value = "Write - if the snippet contains any restricted Processors - /restricted-components", type = "") + @Authorization(value = "Write - /process-groups/{uuid}"), + @Authorization(value = "Read - /{component-type}/{uuid} - For each component in the snippet and their descendant components"), + @Authorization(value = "Write - if the snippet contains any restricted Processors - /restricted-components") } ) @ApiResponses( @@ -2989,9 +2989,9 @@ public class ProcessGroupResource extends ApplicationResource { value = "Instantiates a template", response = FlowEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = ""), - @Authorization(value = "Read - /templates/{uuid}", type = ""), - @Authorization(value = "Write - if the template contains any restricted components - /restricted-components", type = "") + @Authorization(value = "Write - /process-groups/{uuid}"), + @Authorization(value = "Read - /templates/{uuid}"), + @Authorization(value = "Write - if the template contains any restricted components - /restricted-components") } ) @ApiResponses( @@ -3141,8 +3141,8 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a template and discards the specified snippet.", response = TemplateEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = ""), - @Authorization(value = "Read - /{component-type}/{uuid} - For each component in the snippet and their descendant components", type = "") + @Authorization(value = "Write - /process-groups/{uuid}"), + @Authorization(value = "Read - /{component-type}/{uuid} - For each component in the snippet and their descendant components") } ) @ApiResponses( @@ -3213,7 +3213,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Uploads a template", response = TemplateEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -3299,7 +3299,7 @@ public class ProcessGroupResource extends ApplicationResource { value = "Imports a template", response = TemplateEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /process-groups/{uuid}") } ) @ApiResponses( @@ -3381,9 +3381,9 @@ public class ProcessGroupResource extends ApplicationResource { value = "Creates a new controller service", response = ControllerServiceEntity.class, authorizations = { - @Authorization(value = "Write - /process-groups/{uuid}", type = ""), - @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}", type = ""), - @Authorization(value = "Write - if the Controller Service is restricted - /restricted-components", type = "") + @Authorization(value = "Write - /process-groups/{uuid}"), + @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}"), + @Authorization(value = "Write - if the Controller Service is restricted - /restricted-components") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.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/ProcessorResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java index a56241c..460ed37 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.AuthorizeControllerServiceReference; import org.apache.nifi.authorization.Authorizer; @@ -155,7 +155,7 @@ public class ProcessorResource extends ApplicationResource { value = "Gets a processor", response = ProcessorEntity.class, authorizations = { - @Authorization(value = "Read - /processors/{uuid}", type = "") + @Authorization(value = "Read - /processors/{uuid}") } ) @ApiResponses( @@ -208,7 +208,7 @@ public class ProcessorResource extends ApplicationResource { value = "Gets the descriptor for a processor property", response = PropertyDescriptorEntity.class, authorizations = { - @Authorization(value = "Read - /processors/{uuid}", type = "") + @Authorization(value = "Read - /processors/{uuid}") } ) @ApiResponses( @@ -278,7 +278,7 @@ public class ProcessorResource extends ApplicationResource { value = "Gets the state for a processor", response = ComponentStateEntity.class, authorizations = { - @Authorization(value = "Write - /processors/{uuid}", type = "") + @Authorization(value = "Write - /processors/{uuid}") } ) @ApiResponses( @@ -334,7 +334,7 @@ public class ProcessorResource extends ApplicationResource { value = "Clears the state for a processor", response = ComponentStateEntity.class, authorizations = { - @Authorization(value = "Write - /processors/{uuid}", type = "") + @Authorization(value = "Write - /processors/{uuid}") } ) @ApiResponses( @@ -399,8 +399,8 @@ public class ProcessorResource extends ApplicationResource { value = "Updates a processor", response = ProcessorEntity.class, authorizations = { - @Authorization(value = "Write - /processors/{uuid}", type = ""), - @Authorization(value = "Read - any referenced Controller Services if this request changes the reference - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /processors/{uuid}"), + @Authorization(value = "Read - any referenced Controller Services if this request changes the reference - /controller-services/{uuid}") } ) @ApiResponses( @@ -498,9 +498,9 @@ public class ProcessorResource extends ApplicationResource { value = "Deletes a processor", response = ProcessorEntity.class, authorizations = { - @Authorization(value = "Write - /processors/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = ""), - @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /processors/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}"), + @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.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/ProvenanceEventResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.java index 559aeac..a62ea51 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceEventResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.nifi.cluster.coordination.ClusterCoordinator; import org.apache.nifi.cluster.coordination.http.replication.RequestReplicator; import org.apache.nifi.cluster.protocol.NodeIdentifier; @@ -81,7 +81,7 @@ public class ProvenanceEventResource extends ApplicationResource { value = "Gets the input content for a provenance event", response = StreamingOutput.class, authorizations = { - @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -164,7 +164,7 @@ public class ProvenanceEventResource extends ApplicationResource { value = "Gets the output content for a provenance event", response = StreamingOutput.class, authorizations = { - @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -247,7 +247,7 @@ public class ProvenanceEventResource extends ApplicationResource { value = "Gets a provenance event", response = ProvenanceEventEntity.class, authorizations = { - @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -320,8 +320,8 @@ public class ProvenanceEventResource extends ApplicationResource { value = "Replays content from a provenance event", response = ProvenanceEventEntity.class, authorizations = { - @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}", type = ""), - @Authorization(value = "Write Component Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Component Data - /data/{component-type}/{uuid}"), + @Authorization(value = "Write Component Data - /data/{component-type}/{uuid}") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.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/ProvenanceResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java index 55ed489..40f2c5b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; import org.apache.nifi.authorization.resource.Authorizable; @@ -113,7 +113,7 @@ public class ProvenanceResource extends ApplicationResource { value = "Gets the searchable attributes for provenance events", response = ProvenanceOptionsEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = "") + @Authorization(value = "Read - /provenance") } ) @ApiResponses( @@ -162,8 +162,8 @@ public class ProvenanceResource extends ApplicationResource { + "should be deleted by the client who originally submitted it.", response = ProvenanceEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = ""), - @Authorization(value = "Read - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read - /provenance"), + @Authorization(value = "Read - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -258,8 +258,8 @@ public class ProvenanceResource extends ApplicationResource { value = "Gets a provenance query", response = ProvenanceEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = ""), - @Authorization(value = "Read - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read - /provenance"), + @Authorization(value = "Read - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -336,7 +336,7 @@ public class ProvenanceResource extends ApplicationResource { value = "Deletes a provenance query", response = ProvenanceEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = "") + @Authorization(value = "Read - /provenance") } ) @ApiResponses( @@ -414,8 +414,8 @@ public class ProvenanceResource extends ApplicationResource { + "should be deleted by the client who originally submitted it.", response = LineageEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = ""), - @Authorization(value = "Read - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read - /provenance"), + @Authorization(value = "Read - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -513,8 +513,8 @@ public class ProvenanceResource extends ApplicationResource { value = "Gets a lineage query", response = LineageEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = ""), - @Authorization(value = "Read - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read - /provenance"), + @Authorization(value = "Read - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -573,7 +573,7 @@ public class ProvenanceResource extends ApplicationResource { value = "Deletes a lineage query", response = LineageEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = "") + @Authorization(value = "Read - /provenance") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.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/RemoteProcessGroupResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java index fbceee2..391e469 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; @@ -106,7 +106,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { value = "Gets a remote process group", response = RemoteProcessGroupEntity.class, authorizations = { - @Authorization(value = "Read - /remote-process-groups/{uuid}", type = "") + @Authorization(value = "Read - /remote-process-groups/{uuid}") } ) @ApiResponses( @@ -159,8 +159,8 @@ public class RemoteProcessGroupResource extends ApplicationResource { value = "Deletes a remote process group", response = RemoteProcessGroupEntity.class, authorizations = { - @Authorization(value = "Write - /remote-process-groups/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /remote-process-groups/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}") } ) @ApiResponses( @@ -238,7 +238,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = RemoteProcessGroupPortEntity.class, authorizations = { - @Authorization(value = "Write - /remote-process-groups/{uuid}", type = "") + @Authorization(value = "Write - /remote-process-groups/{uuid}") } ) @ApiResponses( @@ -339,7 +339,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = RemoteProcessGroupPortEntity.class, authorizations = { - @Authorization(value = "Write - /remote-process-groups/{uuid}", type = "") + @Authorization(value = "Write - /remote-process-groups/{uuid}") } ) @ApiResponses( @@ -439,7 +439,7 @@ public class RemoteProcessGroupResource extends ApplicationResource { value = "Updates a remote process group", response = RemoteProcessGroupEntity.class, authorizations = { - @Authorization(value = "Write - /remote-process-groups/{uuid}", type = "") + @Authorization(value = "Write - /remote-process-groups/{uuid}") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.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/ReportingTaskResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java index d1b4304..38fd3ff 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.AuthorizeControllerServiceReference; import org.apache.nifi.authorization.Authorizer; @@ -142,7 +142,7 @@ public class ReportingTaskResource extends ApplicationResource { value = "Gets a reporting task", response = ReportingTaskEntity.class, authorizations = { - @Authorization(value = "Read - /reporting-tasks/{uuid}", type = "") + @Authorization(value = "Read - /reporting-tasks/{uuid}") } ) @ApiResponses( @@ -193,7 +193,7 @@ public class ReportingTaskResource extends ApplicationResource { value = "Gets a reporting task property descriptor", response = PropertyDescriptorEntity.class, authorizations = { - @Authorization(value = "Read - /reporting-tasks/{uuid}", type = "") + @Authorization(value = "Read - /reporting-tasks/{uuid}") } ) @ApiResponses( @@ -257,7 +257,7 @@ public class ReportingTaskResource extends ApplicationResource { value = "Gets the state for a reporting task", response = ComponentStateEntity.class, authorizations = { - @Authorization(value = "Write - /reporting-tasks/{uuid}", type = "") + @Authorization(value = "Write - /reporting-tasks/{uuid}") } ) @ApiResponses( @@ -312,7 +312,7 @@ public class ReportingTaskResource extends ApplicationResource { value = "Clears the state for a reporting task", response = ComponentStateEntity.class, authorizations = { - @Authorization(value = "Write - /reporting-tasks/{uuid}", type = "") + @Authorization(value = "Write - /reporting-tasks/{uuid}") } ) @ApiResponses( @@ -376,8 +376,8 @@ public class ReportingTaskResource extends ApplicationResource { value = "Updates a reporting task", response = ReportingTaskEntity.class, authorizations = { - @Authorization(value = "Write - /reporting-tasks/{uuid}", type = ""), - @Authorization(value = "Read - any referenced Controller Services if this request changes the reference - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /reporting-tasks/{uuid}"), + @Authorization(value = "Read - any referenced Controller Services if this request changes the reference - /controller-services/{uuid}") } ) @ApiResponses( @@ -467,9 +467,9 @@ public class ReportingTaskResource extends ApplicationResource { value = "Deletes a reporting task", response = ReportingTaskEntity.class, authorizations = { - @Authorization(value = "Write - /reporting-tasks/{uuid}", type = ""), - @Authorization(value = "Write - /controller", type = ""), - @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /reporting-tasks/{uuid}"), + @Authorization(value = "Write - /controller"), + @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.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/ResourceResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.java index f957302..58993f4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ResourceResource.java @@ -16,11 +16,11 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; import org.apache.nifi.authorization.resource.Authorizable; @@ -70,7 +70,7 @@ public class ResourceResource extends ApplicationResource { value = "Gets the available resources that support access/authorization policies", response = ResourcesEntity.class, authorizations = { - @Authorization(value = "Read - /resources", type = "") + @Authorization(value = "Read - /resources") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.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/SiteToSiteResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.java index 2e17637..36cfda1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SiteToSiteResource.java @@ -17,11 +17,11 @@ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; import org.apache.nifi.authorization.resource.Authorizable; @@ -109,7 +109,7 @@ public class SiteToSiteResource extends ApplicationResource { value = "Returns the details about this NiFi necessary to communicate via site to site", response = ControllerEntity.class, authorizations = { - @Authorization(value = "Read - /site-to-site", type = "") + @Authorization(value = "Read - /site-to-site") } ) @ApiResponses( @@ -160,7 +160,7 @@ public class SiteToSiteResource extends ApplicationResource { value = "Returns the available Peers and its status of this NiFi", response = PeersEntity.class, authorizations = { - @Authorization(value = "Read - /site-to-site", type = "") + @Authorization(value = "Read - /site-to-site") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.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/SnippetResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java index 5817cd7..6833428 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.nifi.authorization.AccessDeniedException; import org.apache.nifi.authorization.AuthorizableLookup; import org.apache.nifi.authorization.Authorizer; @@ -135,7 +135,7 @@ public class SnippetResource extends ApplicationResource { value = "Creates a snippet. The snippet will be automatically discarded if not used in a subsequent request after 1 minute.", response = SnippetEntity.class, authorizations = { - @Authorization(value = "Read or Write - /{component-type}/{uuid} - For every component (all Read or all Write) in the Snippet and their descendant components", type = "") + @Authorization(value = "Read or Write - /{component-type}/{uuid} - For every component (all Read or all Write) in the Snippet and their descendant components") } ) @ApiResponses( @@ -220,8 +220,8 @@ public class SnippetResource extends ApplicationResource { value = "Move's the components in this Snippet into a new Process Group and discards the snippet", response = SnippetEntity.class, authorizations = { - @Authorization(value = "Write Process Group - /process-groups/{uuid}", type = ""), - @Authorization(value = "Write - /{component-type}/{uuid} - For each component in the Snippet and their descendant components", type = "") + @Authorization(value = "Write Process Group - /process-groups/{uuid}"), + @Authorization(value = "Write - /{component-type}/{uuid} - For each component in the Snippet and their descendant components") } ) @ApiResponses( @@ -301,8 +301,8 @@ public class SnippetResource extends ApplicationResource { value = "Deletes the components in a snippet and discards the snippet", response = SnippetEntity.class, authorizations = { - @Authorization(value = "Write - /{component-type}/{uuid} - For each component in the Snippet and their descendant components", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = ""), + @Authorization(value = "Write - /{component-type}/{uuid} - For each component in the Snippet and their descendant components"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}"), } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.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/SystemDiagnosticsResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java index ff69e60..8b9fed4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; import org.apache.nifi.authorization.resource.Authorizable; @@ -74,7 +74,7 @@ public class SystemDiagnosticsResource extends ApplicationResource { value = "Gets the diagnostics for the system NiFi is running on", response = SystemDiagnosticsEntity.class, authorizations = { - @Authorization(value = "Read - /system", type = "") + @Authorization(value = "Read - /system") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.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/TemplateResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java index 052f75c..c31daa1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.RequestAction; @@ -97,7 +97,7 @@ public class TemplateResource extends ApplicationResource { value = "Exports a template", response = String.class, authorizations = { - @Authorization(value = "Read - /templates/{uuid}", type = "") + @Authorization(value = "Read - /templates/{uuid}") } ) @ApiResponses( @@ -165,8 +165,8 @@ public class TemplateResource extends ApplicationResource { value = "Deletes a template", response = TemplateEntity.class, authorizations = { - @Authorization(value = "Write - /templates/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /templates/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.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/TenantsResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java index 080ae5f..f339e31 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TenantsResource.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api; -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; -import com.wordnik.swagger.annotations.ApiResponse; -import com.wordnik.swagger.annotations.ApiResponses; -import com.wordnik.swagger.annotations.Authorization; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.Authorization; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.Authorizer; import org.apache.nifi.authorization.AuthorizerCapabilityDetection; @@ -129,7 +129,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -214,7 +214,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -269,7 +269,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UsersEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -327,7 +327,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -417,7 +417,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -518,7 +518,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -603,7 +603,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -658,7 +658,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserGroupsEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -715,7 +715,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -805,7 +805,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -885,7 +885,7 @@ public class TenantsResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = TenantsEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 508e097..e0e1327 100644 --- a/pom.xml +++ b/pom.xml @@ -237,9 +237,9 @@ <version>3.2.2</version> </dependency> <dependency> - <groupId>com.wordnik</groupId> + <groupId>io.swagger</groupId> <artifactId>swagger-annotations</artifactId> - <version>1.5.3-M1</version> + <version>1.5.16</version> </dependency> <dependency> <groupId>com.rethinkdb</groupId>
