http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/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 865631a..1e0ffb3 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 @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlRootElement;
http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CurrentUserEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CurrentUserEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CurrentUserEntity.java index d24ce67..6b8e28f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CurrentUserEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CurrentUserEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.PermissionsDTO; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowBreadcrumbEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowBreadcrumbEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowBreadcrumbEntity.java index 4b042f7..b97b9b3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowBreadcrumbEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowBreadcrumbEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.PermissionsDTO; import org.apache.nifi.web.api.dto.flow.FlowBreadcrumbDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowConfigurationEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowConfigurationEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowConfigurationEntity.java index 54af4d4..52b01d4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowConfigurationEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/FlowConfigurationEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.FlowConfigurationDTO; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InstantiateTemplateRequestEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InstantiateTemplateRequestEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InstantiateTemplateRequestEntity.java index 8945f36..d140105 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InstantiateTemplateRequestEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/InstantiateTemplateRequestEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.FlowSnippetDTO; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java index ff77979..2454af1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.PortDTO; import org.apache.nifi.web.api.dto.status.PortStatusDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortStatusSnapshotEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortStatusSnapshotEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortStatusSnapshotEntity.java index d44fab4..2628e3b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortStatusSnapshotEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/PortStatusSnapshotEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ReadablePermission; import org.apache.nifi.web.api.dto.status.PortStatusSnapshotDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java index c16c5c9..83af9d8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ProcessGroupDTO; import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupFlowEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupFlowEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupFlowEntity.java index ebcb0f8..9bdd512 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupFlowEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupFlowEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.PermissionsDTO; import org.apache.nifi.web.api.dto.flow.ProcessGroupFlowDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusSnapshotEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusSnapshotEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusSnapshotEntity.java index 6434b32..9522a3d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusSnapshotEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupStatusSnapshotEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ReadablePermission; import org.apache.nifi.web.api.dto.status.ProcessGroupStatusSnapshotDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java index bfea1b5..3607c0b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ProcessorDTO; import org.apache.nifi.web.api.dto.status.ProcessorStatusDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorStatusSnapshotEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorStatusSnapshotEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorStatusSnapshotEntity.java index 57b8636..e59b34c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorStatusSnapshotEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorStatusSnapshotEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ReadablePermission; import org.apache.nifi.web.api.dto.status.ProcessorStatusSnapshotDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java index ee44c27..8b049a4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupEntity.java @@ -16,12 +16,12 @@ */ package org.apache.nifi.web.api.entity; -import javax.xml.bind.annotation.XmlRootElement; - -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO; import org.apache.nifi.web.api.dto.status.RemoteProcessGroupStatusDTO; +import javax.xml.bind.annotation.XmlRootElement; + /** * A serialized representation of this class can be placed in the entity body of a request or response to or from the API. This particular entity holds a reference to a RemoteProcessGroupDTO. */ http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java index 54bf45b..6dcfe7d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/RemoteProcessGroupStatusSnapshotEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ReadablePermission; import org.apache.nifi.web.api.dto.status.RemoteProcessGroupStatusSnapshotDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ScheduleComponentsEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ScheduleComponentsEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ScheduleComponentsEntity.java index 3e4c9a4..280d015 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ScheduleComponentsEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ScheduleComponentsEntity.java @@ -16,13 +16,11 @@ */ package org.apache.nifi.web.api.entity; -import java.util.Map; - -import javax.xml.bind.annotation.XmlRootElement; - +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.RevisionDTO; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.Map; /** * A serialized representation of this class can be placed in the entity body of a request to the API. http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java index 7ec8de6..867ac61 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SnippetEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.SnippetDTO; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SubmitReplayRequestEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SubmitReplayRequestEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SubmitReplayRequestEntity.java index f491e0d..2297b56 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SubmitReplayRequestEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/SubmitReplayRequestEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java index b6a2bc4..fde2baf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/TemplatesEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimeAdapter; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UpdateControllerServiceReferenceRequestEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UpdateControllerServiceReferenceRequestEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UpdateControllerServiceReferenceRequestEntity.java index d58b1ef..2a43168 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UpdateControllerServiceReferenceRequestEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UpdateControllerServiceReferenceRequestEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.RevisionDTO; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java index 19c3448..802f194 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/UsersEntity.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimeAdapter; import javax.xml.bind.annotation.XmlRootElement; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableEntity.java index 06f6fcf..ce56367 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableEntity.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.nifi.web.api.entity; -import javax.xml.bind.annotation.XmlRootElement; - +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.VariableDTO; import org.apache.nifi.web.api.dto.WritablePermission; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "variableEntity") public class VariableEntity extends Entity implements WritablePermission { http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryEntity.java index 1b7da0c..142ce22 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryEntity.java @@ -14,10 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.RevisionDTO; import org.apache.nifi.web.api.dto.VariableRegistryDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryUpdateRequestEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryUpdateRequestEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryUpdateRequestEntity.java index bfeb9ce..8b0e4cf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryUpdateRequestEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/VariableRegistryUpdateRequestEntity.java @@ -14,10 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.nifi.web.api.entity; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.RevisionDTO; import org.apache.nifi.web.api.dto.VariableRegistryUpdateRequestDTO; http://git-wip-us.apache.org/repos/asf/nifi/blob/697c382d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml index 55a68de..4dfc2cd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml @@ -59,7 +59,7 @@ <plugin> <groupId>com.github.kongchen</groupId> <artifactId>swagger-maven-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.5</version> <executions> <execution> <phase>compile</phase> @@ -226,7 +226,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.wordnik</groupId> + <groupId>io.swagger</groupId> <artifactId>swagger-annotations</artifactId> <scope>provided</scope> </dependency> 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/AccessPolicyResource.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/AccessPolicyResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java index 2e71058..1f4a260 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessPolicyResource.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; @@ -116,7 +116,7 @@ public class AccessPolicyResource extends ApplicationResource { + "a 403 response will be returned.", response = AccessPolicyEntity.class, authorizations = { - @Authorization(value = "Read - /policies/{resource}", type = "") + @Authorization(value = "Read - /policies/{resource}") } ) @ApiResponses( @@ -183,7 +183,7 @@ public class AccessPolicyResource extends ApplicationResource { value = "Creates an access policy", response = AccessPolicyEntity.class, authorizations = { - @Authorization(value = "Write - /policies/{resource}", type = "") + @Authorization(value = "Write - /policies/{resource}") } ) @ApiResponses( @@ -274,7 +274,7 @@ public class AccessPolicyResource extends ApplicationResource { value = "Gets an access policy", response = AccessPolicyEntity.class, authorizations = { - @Authorization(value = "Read - /policies/{resource}", type = "") + @Authorization(value = "Read - /policies/{resource}") } ) @ApiResponses( @@ -331,7 +331,7 @@ public class AccessPolicyResource extends ApplicationResource { value = "Updates a access policy", response = AccessPolicyEntity.class, authorizations = { - @Authorization(value = "Write - /policies/{resource}", type = "") + @Authorization(value = "Write - /policies/{resource}") } ) @ApiResponses( @@ -422,8 +422,8 @@ public class AccessPolicyResource extends ApplicationResource { value = "Deletes an access policy", response = AccessPolicyEntity.class, authorizations = { - @Authorization(value = "Write - /policies/{resource}", type = ""), - @Authorization(value = "Write - Policy of the parent resource - /policies/{resource}", type = "") + @Authorization(value = "Write - /policies/{resource}"), + @Authorization(value = "Write - Policy of the parent resource - /policies/{resource}") } ) @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/AccessResource.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/AccessResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java index 3031e2e..ddb4dce 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/AccessResource.java @@ -24,11 +24,11 @@ import com.nimbusds.oauth2.sdk.id.State; import com.nimbusds.openid.connect.sdk.AuthenticationErrorResponse; import com.nimbusds.openid.connect.sdk.AuthenticationResponseParser; import com.nimbusds.openid.connect.sdk.AuthenticationSuccessResponse; -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 io.jsonwebtoken.JwtException; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.admin.service.AdministrationException; import org.apache.nifi.authentication.AuthenticationResponse; 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/ConnectionResource.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/ConnectionResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java index 70046db..773d8a6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.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.ConnectionAuthorizable; @@ -107,8 +107,8 @@ public class ConnectionResource extends ApplicationResource { value = "Gets a connection", response = ConnectionEntity.class, authorizations = { - @Authorization(value = "Read Source - /{component-type}/{uuid}", type = ""), - @Authorization(value = "Read Destination - /{component-type}/{uuid}", type = "") + @Authorization(value = "Read Source - /{component-type}/{uuid}"), + @Authorization(value = "Read Destination - /{component-type}/{uuid}") } ) @ApiResponses( @@ -163,10 +163,10 @@ public class ConnectionResource extends ApplicationResource { value = "Updates a connection", response = ConnectionEntity.class, authorizations = { - @Authorization(value = "Write Source - /{component-type}/{uuid}", type = ""), - @Authorization(value = "Write Destination - /{component-type}/{uuid}", type = ""), - @Authorization(value = "Write New Destination - /{component-type}/{uuid} - if updating Destination", type = ""), - @Authorization(value = "Write Process Group - /process-groups/{uuid} - if updating Destination", type = "") + @Authorization(value = "Write Source - /{component-type}/{uuid}"), + @Authorization(value = "Write Destination - /{component-type}/{uuid}"), + @Authorization(value = "Write New Destination - /{component-type}/{uuid} - if updating Destination"), + @Authorization(value = "Write Process Group - /process-groups/{uuid} - if updating Destination") } ) @ApiResponses( @@ -294,9 +294,9 @@ public class ConnectionResource extends ApplicationResource { value = "Deletes a connection", response = ConnectionEntity.class, authorizations = { - @Authorization(value = "Write Source - /{component-type}/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = ""), - @Authorization(value = "Write Destination - /{component-type}/{uuid}", type = "") + @Authorization(value = "Write Source - /{component-type}/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}"), + @Authorization(value = "Write Destination - /{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/ControllerResource.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/ControllerResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java index 97cb4c9..23ac3cd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java @@ -17,12 +17,12 @@ package org.apache.nifi.web.api; import com.sun.jersey.api.core.ResourceContext; -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; @@ -108,7 +108,7 @@ public class ControllerResource extends ApplicationResource { value = "Retrieves the configuration for this NiFi Controller", response = ControllerConfigurationEntity.class, authorizations = { - @Authorization(value = "Read - /controller", type = "") + @Authorization(value = "Read - /controller") } ) @ApiResponses( @@ -146,7 +146,7 @@ public class ControllerResource extends ApplicationResource { value = "Retrieves the configuration for this NiFi", response = ControllerConfigurationEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = "") + @Authorization(value = "Write - /controller") } ) @ApiResponses( @@ -211,9 +211,9 @@ public class ControllerResource extends ApplicationResource { value = "Creates a new reporting task", response = ReportingTaskEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = ""), - @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}", type = ""), - @Authorization(value = "Write - if the Reporting Task is restricted - /restricted-components", type = "") + @Authorization(value = "Write - /controller"), + @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}"), + @Authorization(value = "Write - if the Reporting Task is restricted - /restricted-components") } ) @ApiResponses( @@ -309,7 +309,7 @@ public class ControllerResource extends ApplicationResource { value = "Creates a new bulletin", response = BulletinEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = "") + @Authorization(value = "Write - /controller") } ) @ApiResponses( @@ -378,9 +378,9 @@ public class ControllerResource extends ApplicationResource { value = "Creates a new controller service", response = ControllerServiceEntity.class, authorizations = { - @Authorization(value = "Write - /controller", 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 - /controller"), + @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}"), + @Authorization(value = "Write - if the Controller Service is restricted - /restricted-components") } ) @ApiResponses( @@ -483,7 +483,7 @@ public class ControllerResource extends ApplicationResource { notes = "Returns the contents of the cluster including all nodes and their status.", response = ClusterEntity.class, authorizations = { - @Authorization(value = "Read - /controller", type = "") + @Authorization(value = "Read - /controller") } ) @ApiResponses( @@ -531,7 +531,7 @@ public class ControllerResource extends ApplicationResource { value = "Gets a node in the cluster", response = NodeEntity.class, authorizations = { - @Authorization(value = "Read - /controller", type = "") + @Authorization(value = "Read - /controller") } ) @ApiResponses( @@ -587,7 +587,7 @@ public class ControllerResource extends ApplicationResource { value = "Updates a node in the cluster", response = NodeEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = "") + @Authorization(value = "Write - /controller") } ) @ApiResponses( @@ -657,7 +657,7 @@ public class ControllerResource extends ApplicationResource { value = "Removes a node from the cluster", response = NodeEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = "") + @Authorization(value = "Write - /controller") } ) @ApiResponses( @@ -714,7 +714,7 @@ public class ControllerResource extends ApplicationResource { value = "Purges history", response = HistoryEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = "") + @Authorization(value = "Write - /controller") } ) @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/ControllerServiceResource.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/ControllerServiceResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java index fdaff5a..dd41521 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.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 ControllerServiceResource extends ApplicationResource { value = "Gets a controller service", response = ControllerServiceEntity.class, authorizations = { - @Authorization(value = "Read - /controller-services/{uuid}", type = "") + @Authorization(value = "Read - /controller-services/{uuid}") } ) @ApiResponses( @@ -206,7 +206,7 @@ public class ControllerServiceResource extends ApplicationResource { value = "Gets a controller service property descriptor", response = PropertyDescriptorEntity.class, authorizations = { - @Authorization(value = "Read - /controller-services/{uuid}", type = "") + @Authorization(value = "Read - /controller-services/{uuid}") } ) @ApiResponses( @@ -270,7 +270,7 @@ public class ControllerServiceResource extends ApplicationResource { value = "Gets the state for a controller service", response = ComponentStateEntity.class, authorizations = { - @Authorization(value = "Write - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /controller-services/{uuid}") } ) @ApiResponses( @@ -325,7 +325,7 @@ public class ControllerServiceResource extends ApplicationResource { value = "Clears the state for a controller service", response = ComponentStateEntity.class, authorizations = { - @Authorization(value = "Write - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /controller-services/{uuid}") } ) @ApiResponses( @@ -387,7 +387,7 @@ public class ControllerServiceResource extends ApplicationResource { value = "Gets a controller service", response = ControllerServiceReferencingComponentsEntity.class, authorizations = { - @Authorization(value = "Read - /controller-services/{uuid}", type = "") + @Authorization(value = "Read - /controller-services/{uuid}") } ) @ApiResponses( @@ -437,7 +437,7 @@ public class ControllerServiceResource extends ApplicationResource { value = "Updates a controller services references", response = ControllerServiceReferencingComponentsEntity.class, authorizations = { - @Authorization(value = "Write - /{component-type}/{uuid} - For each referencing component specified", type = "") + @Authorization(value = "Write - /{component-type}/{uuid} - For each referencing component specified") } ) @ApiResponses( @@ -572,8 +572,8 @@ public class ControllerServiceResource extends ApplicationResource { value = "Updates a controller service", response = ControllerServiceEntity.class, authorizations = { - @Authorization(value = "Write - /controller-services/{uuid}", type = ""), - @Authorization(value = "Read - any referenced Controller Services if this request changes the reference - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /controller-services/{uuid}"), + @Authorization(value = "Read - any referenced Controller Services if this request changes the reference - /controller-services/{uuid}") } ) @ApiResponses( @@ -663,10 +663,10 @@ public class ControllerServiceResource extends ApplicationResource { value = "Deletes a controller service", response = ControllerServiceEntity.class, authorizations = { - @Authorization(value = "Write - /controller-services/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group if scoped by Process Group - /process-groups/{uuid}", type = ""), - @Authorization(value = "Write - Controller if scoped by Controller - /controller", type = ""), - @Authorization(value = "Read - any referenced Controller Services - /controller-services/{uuid}", type = "") + @Authorization(value = "Write - /controller-services/{uuid}"), + @Authorization(value = "Write - Parent Process Group if scoped by Process Group - /process-groups/{uuid}"), + @Authorization(value = "Write - Controller if scoped by Controller - /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/CountersResource.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/CountersResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java index 903b102..028e6a1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/CountersResource.java @@ -17,12 +17,12 @@ package org.apache.nifi.web.api; import com.sun.jersey.api.core.ResourceContext; -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; @@ -93,7 +93,7 @@ public class CountersResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = CountersEntity.class, authorizations = { - @Authorization(value = "Read - /counters", type = "") + @Authorization(value = "Read - /counters") } ) @ApiResponses( @@ -183,7 +183,7 @@ public class CountersResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = CounterEntity.class, authorizations = { - @Authorization(value = "Write - /counters", type = "") + @Authorization(value = "Write - /counters") } ) @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/DataTransferResource.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/DataTransferResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/DataTransferResource.java index 897ff7a..bf55c05 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/DataTransferResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/DataTransferResource.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.AccessDeniedException; import org.apache.nifi.authorization.AuthorizableLookup; @@ -156,7 +156,7 @@ public class DataTransferResource extends ApplicationResource { value = "Create a transaction to the specified output port or input port", response = TransactionResultEntity.class, authorizations = { - @Authorization(value = "Write - /data-transfer/{component-type}/{uuid}", type = "") + @Authorization(value = "Write - /data-transfer/{component-type}/{uuid}") } ) @ApiResponses( @@ -232,7 +232,7 @@ public class DataTransferResource extends ApplicationResource { value = "Transfer flow files to the input port", response = String.class, authorizations = { - @Authorization(value = "Write - /data-transfer/input-ports/{uuid}", type = "") + @Authorization(value = "Write - /data-transfer/input-ports/{uuid}") } ) @ApiResponses( @@ -382,7 +382,7 @@ public class DataTransferResource extends ApplicationResource { value = "Commit or cancel the specified transaction", response = TransactionResultEntity.class, authorizations = { - @Authorization(value = "Write - /data-transfer/output-ports/{uuid}", type = "") + @Authorization(value = "Write - /data-transfer/output-ports/{uuid}") } ) @ApiResponses( @@ -491,7 +491,7 @@ public class DataTransferResource extends ApplicationResource { value = "Commit or cancel the specified transaction", response = TransactionResultEntity.class, authorizations = { - @Authorization(value = "Write - /data-transfer/input-ports/{uuid}", type = "") + @Authorization(value = "Write - /data-transfer/input-ports/{uuid}") } ) @ApiResponses( @@ -611,7 +611,7 @@ public class DataTransferResource extends ApplicationResource { value = "Transfer flow files from the output port", response = StreamingOutput.class, authorizations = { - @Authorization(value = "Write - /data-transfer/output-ports/{uuid}", type = "") + @Authorization(value = "Write - /data-transfer/output-ports/{uuid}") } ) @ApiResponses( @@ -697,7 +697,7 @@ public class DataTransferResource extends ApplicationResource { value = "Extend transaction TTL", response = TransactionResultEntity.class, authorizations = { - @Authorization(value = "Write - /data-transfer/input-ports/{uuid}", type = "") + @Authorization(value = "Write - /data-transfer/input-ports/{uuid}") } ) @ApiResponses( @@ -734,7 +734,7 @@ public class DataTransferResource extends ApplicationResource { value = "Extend transaction TTL", response = TransactionResultEntity.class, authorizations = { - @Authorization(value = "Write - /data-transfer/output-ports/{uuid}", type = "") + @Authorization(value = "Write - /data-transfer/output-ports/{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/FlowFileQueueResource.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/FlowFileQueueResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowFileQueueResource.java index 1017aca..cb45c70 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowFileQueueResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowFileQueueResource.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.ConnectionAuthorizable; @@ -128,7 +128,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Gets a FlowFile from a Connection.", response = FlowFileEntity.class, authorizations = { - @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -204,7 +204,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Gets the content for a FlowFile in a Connection.", response = StreamingOutput.class, authorizations = { - @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -300,7 +300,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Lists the contents of the queue in this connection.", response = ListingRequestEntity.class, authorizations = { - @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -371,7 +371,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Gets the current status of a listing request for the specified connection.", response = ListingRequestEntity.class, authorizations = { - @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -433,7 +433,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Cancels and/or removes a request to list the contents of this connection.", response = ListingRequestEntity.class, authorizations = { - @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Read Source Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -523,7 +523,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Creates a request to drop the contents of the queue in this connection.", response = DropRequestEntity.class, authorizations = { - @Authorization(value = "Write Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Write Source Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -594,7 +594,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Gets the current status of a drop request for the specified connection.", response = DropRequestEntity.class, authorizations = { - @Authorization(value = "Write Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Write Source Data - /data/{component-type}/{uuid}") } ) @ApiResponses( @@ -656,7 +656,7 @@ public class FlowFileQueueResource extends ApplicationResource { value = "Cancels and/or removes a request to drop the contents of this connection.", response = DropRequestEntity.class, authorizations = { - @Authorization(value = "Write Source Data - /data/{component-type}/{uuid}", type = "") + @Authorization(value = "Write Source 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/FlowResource.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/FlowResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java index 5d5a796..378e381 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java @@ -17,12 +17,12 @@ package org.apache.nifi.web.api; import com.sun.jersey.api.core.ResourceContext; -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; @@ -220,7 +220,7 @@ public class FlowResource extends ApplicationResource { value = "Generates a client id.", response = String.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -249,7 +249,7 @@ public class FlowResource extends ApplicationResource { value = "Retrieves the configuration for this NiFi flow", response = FlowConfigurationEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -285,7 +285,7 @@ public class FlowResource extends ApplicationResource { value = "Retrieves the user identity of the user making the request", response = CurrentUserEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) public Response getCurrentUser() { @@ -324,7 +324,7 @@ public class FlowResource extends ApplicationResource { value = "Gets a process group", response = ProcessGroupFlowEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -372,7 +372,7 @@ public class FlowResource extends ApplicationResource { value = "Gets all controller services", response = ControllerServicesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -418,7 +418,7 @@ public class FlowResource extends ApplicationResource { value = "Gets all controller services", response = ControllerServicesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -471,7 +471,7 @@ public class FlowResource extends ApplicationResource { value = "Gets all reporting tasks", response = ReportingTasksEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -518,8 +518,8 @@ public class FlowResource extends ApplicationResource { value = "Schedule or unschedule components in the specified Process Group.", response = ScheduleComponentsEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = ""), - @Authorization(value = "Write - /{component-type}/{uuid} - For every component being scheduled/unscheduled", type = "") + @Authorization(value = "Read - /flow"), + @Authorization(value = "Write - /{component-type}/{uuid} - For every component being scheduled/unscheduled") } ) @ApiResponses( @@ -657,8 +657,8 @@ public class FlowResource extends ApplicationResource { @ApiOperation(value = "Enable or disable Controller Services in the specified Process Group.", response = ActivateControllerServicesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = ""), - @Authorization(value = "Write - /{component-type}/{uuid} - For every service being enabled/disabled", type = "") + @Authorization(value = "Read - /flow"), + @Authorization(value = "Write - /{component-type}/{uuid} - For every service being enabled/disabled") }) @ApiResponses( value = { @@ -791,7 +791,7 @@ public class FlowResource extends ApplicationResource { notes = "Only search results from authorized components will be returned.", response = SearchResultsEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -830,7 +830,7 @@ public class FlowResource extends ApplicationResource { value = "Gets the current status of this NiFi", response = ControllerStatusEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -873,7 +873,7 @@ public class FlowResource extends ApplicationResource { value = "The cluster summary for this NiFi", response = ClusteSummaryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -929,10 +929,10 @@ public class FlowResource extends ApplicationResource { value = "Retrieves Controller level bulletins", response = ControllerBulletinsEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = ""), - @Authorization(value = "Read - /controller - For controller bulletins", type = ""), - @Authorization(value = "Read - /controller-services/{uuid} - For controller service bulletins", type = ""), - @Authorization(value = "Read - /reporting-tasks/{uuid} - For reporting task bulletins", type = "") + @Authorization(value = "Read - /flow"), + @Authorization(value = "Read - /controller - For controller bulletins"), + @Authorization(value = "Read - /controller-services/{uuid} - For controller service bulletins"), + @Authorization(value = "Read - /reporting-tasks/{uuid} - For reporting task bulletins") } ) @ApiResponses( @@ -969,7 +969,7 @@ public class FlowResource extends ApplicationResource { value = "Retrieves the banners for this NiFi", response = BannerEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1015,7 +1015,7 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = ProcessorTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1073,7 +1073,7 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = ControllerServiceTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1157,7 +1157,7 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = ReportingTaskTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1214,7 +1214,7 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = PrioritizerTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1253,7 +1253,7 @@ public class FlowResource extends ApplicationResource { value = "Retrieves details about this NiFi to put in the About dialog", response = AboutEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1324,8 +1324,8 @@ public class FlowResource extends ApplicationResource { value = "Gets current bulletins", response = BulletinBoardEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = ""), - @Authorization(value = "Read - /{component-type}/{uuid} - For component specific bulletins", type = "") + @Authorization(value = "Read - /flow"), + @Authorization(value = "Read - /{component-type}/{uuid} - For component specific bulletins") } ) @ApiResponses( @@ -1427,7 +1427,7 @@ public class FlowResource extends ApplicationResource { value = "Gets status for a processor", response = ProcessorStatusEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1500,7 +1500,7 @@ public class FlowResource extends ApplicationResource { value = "Gets status for an input port", response = PortStatusEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1573,7 +1573,7 @@ public class FlowResource extends ApplicationResource { value = "Gets status for an output port", response = PortStatusEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1646,7 +1646,7 @@ public class FlowResource extends ApplicationResource { value = "Gets status for a remote process group", response = RemoteProcessGroupStatusEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1722,7 +1722,7 @@ public class FlowResource extends ApplicationResource { + "recursive set to true, it will return the current status of every component in the flow.", response = ProcessGroupStatusEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1800,7 +1800,7 @@ public class FlowResource extends ApplicationResource { value = "Gets status for a connection", response = ConnectionStatusEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1877,7 +1877,7 @@ public class FlowResource extends ApplicationResource { value = "Gets status history for a processor", response = StatusHistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1923,7 +1923,7 @@ public class FlowResource extends ApplicationResource { value = "Gets status history for a remote process group", response = StatusHistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1969,7 +1969,7 @@ public class FlowResource extends ApplicationResource { value = "Gets the status history", response = StatusHistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2015,7 +2015,7 @@ public class FlowResource extends ApplicationResource { value = "Gets the status history for a connection", response = StatusHistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2084,7 +2084,7 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = HistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2222,7 +2222,7 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = ActionEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2272,8 +2272,8 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = ComponentHistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = ""), - @Authorization(value = "Read underlying component - /{component-type}/{uuid}", type = "") + @Authorization(value = "Read - /flow"), + @Authorization(value = "Read underlying component - /{component-type}/{uuid}") } ) @ApiResponses( @@ -2354,7 +2354,7 @@ public class FlowResource extends ApplicationResource { value = "Gets all templates", response = TemplatesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2406,7 +2406,7 @@ public class FlowResource extends ApplicationResource { notes = NON_GUARANTEED_ENDPOINT, response = ClusterSearchResultsEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @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/FunnelResource.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/FunnelResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java index 3547c17..787d23e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.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 FunnelResource extends ApplicationResource { value = "Gets a funnel", response = FunnelEntity.class, authorizations = { - @Authorization(value = "Read - /funnels/{uuid}", type = "") + @Authorization(value = "Read - /funnels/{uuid}") } ) @ApiResponses( @@ -154,7 +154,7 @@ public class FunnelResource extends ApplicationResource { value = "Updates a funnel", response = FunnelEntity.class, authorizations = { - @Authorization(value = "Write - /funnels/{uuid}", type = "") + @Authorization(value = "Write - /funnels/{uuid}") } ) @ApiResponses( @@ -245,8 +245,8 @@ public class FunnelResource extends ApplicationResource { value = "Deletes a funnel", response = FunnelEntity.class, authorizations = { - @Authorization(value = "Write - /funnels/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /funnels/{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/InputPortResource.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/InputPortResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java index 5365900..a9961b7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.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 InputPortResource extends ApplicationResource { value = "Gets an input port", response = PortEntity.class, authorizations = { - @Authorization(value = "Read - /input-ports/{uuid}", type = "") + @Authorization(value = "Read - /input-ports/{uuid}") } ) @ApiResponses( @@ -154,7 +154,7 @@ public class InputPortResource extends ApplicationResource { value = "Updates an input port", response = PortEntity.class, authorizations = { - @Authorization(value = "Write - /input-ports/{uuid}", type = "") + @Authorization(value = "Write - /input-ports/{uuid}") } ) @ApiResponses( @@ -244,8 +244,8 @@ public class InputPortResource extends ApplicationResource { value = "Deletes an input port", response = PortEntity.class, authorizations = { - @Authorization(value = "Write - /input-ports/{uuid}", type = ""), - @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}", type = "") + @Authorization(value = "Write - /input-ports/{uuid}"), + @Authorization(value = "Write - Parent Process Group - /process-groups/{uuid}") } ) @ApiResponses(
