From 697c382d9bd4a3aaa05bc28b64a5e74592101c61 Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Thu, 28 Sep 2017 11:02:27 -0400 Subject: [PATCH] NIFI-4328: - Upgrading swagger and the corresponding maven plugin to address issues discovered in recursive domain models. --- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../org/apache/nifi/web/api/dto/AboutDTO.java | 2 +- .../web/api/dto/AccessConfigurationDTO.java | 3 +- .../nifi/web/api/dto/AccessPolicyDTO.java | 2 +- .../web/api/dto/AccessPolicySummaryDTO.java | 2 +- .../nifi/web/api/dto/AccessStatusDTO.java | 3 +- .../web/api/dto/AffectedComponentDTO.java | 2 +- .../nifi/web/api/dto/AllowableValueDTO.java | 2 +- .../apache/nifi/web/api/dto/BannerDTO.java | 3 +- .../nifi/web/api/dto/BatchSettingsDTO.java | 2 +- .../nifi/web/api/dto/BulletinBoardDTO.java | 10 +- .../apache/nifi/web/api/dto/BulletinDTO.java | 2 +- .../nifi/web/api/dto/BulletinQueryDTO.java | 3 +- .../apache/nifi/web/api/dto/BundleDTO.java | 2 +- .../apache/nifi/web/api/dto/ClusterDTO.java | 8 +- .../nifi/web/api/dto/ClusterSummaryDTO.java | 2 +- .../apache/nifi/web/api/dto/ComponentDTO.java | 3 +- .../nifi/web/api/dto/ComponentHistoryDTO.java | 5 +- .../web/api/dto/ComponentReferenceDTO.java | 2 +- .../nifi/web/api/dto/ComponentStateDTO.java | 2 +- .../nifi/web/api/dto/ConnectableDTO.java | 3 +- .../nifi/web/api/dto/ConnectionDTO.java | 5 +- .../api/dto/ControllerConfigurationDTO.java | 2 +- .../nifi/web/api/dto/ControllerDTO.java | 5 +- .../web/api/dto/ControllerServiceApiDTO.java | 2 +- .../web/api/dto/ControllerServiceDTO.java | 2 +- ...trollerServiceReferencingComponentDTO.java | 2 +- .../apache/nifi/web/api/dto/CounterDTO.java | 2 +- .../apache/nifi/web/api/dto/CountersDTO.java | 5 +- .../nifi/web/api/dto/CountersSnapshotDTO.java | 13 +-- .../nifi/web/api/dto/DimensionsDTO.java | 2 +- .../nifi/web/api/dto/DocumentedTypeDTO.java | 2 +- .../nifi/web/api/dto/DropRequestDTO.java | 7 +- .../web/api/dto/FlowConfigurationDTO.java | 2 +- .../apache/nifi/web/api/dto/FlowFileDTO.java | 2 +- .../nifi/web/api/dto/FlowFileSummaryDTO.java | 2 +- .../nifi/web/api/dto/FlowSnippetDTO.java | 2 +- .../org/apache/nifi/web/api/dto/LabelDTO.java | 4 +- .../nifi/web/api/dto/ListingRequestDTO.java | 12 +-- .../web/api/dto/NodeCountersSnapshotDTO.java | 4 +- .../org/apache/nifi/web/api/dto/NodeDTO.java | 2 +- .../apache/nifi/web/api/dto/NodeEventDTO.java | 7 +- .../dto/NodeSystemDiagnosticsSnapshotDTO.java | 4 +- .../nifi/web/api/dto/PermissionsDTO.java | 2 +- .../org/apache/nifi/web/api/dto/PortDTO.java | 5 +- .../apache/nifi/web/api/dto/PositionDTO.java | 3 +- .../nifi/web/api/dto/PreviousValueDTO.java | 2 +- .../nifi/web/api/dto/ProcessGroupDTO.java | 5 +- .../nifi/web/api/dto/ProcessorConfigDTO.java | 6 +- .../apache/nifi/web/api/dto/ProcessorDTO.java | 2 +- .../web/api/dto/PropertyDescriptorDTO.java | 2 +- .../nifi/web/api/dto/PropertyHistoryDTO.java | 5 +- .../apache/nifi/web/api/dto/QueueSizeDTO.java | 2 +- .../nifi/web/api/dto/ReadablePermission.java | 2 +- .../nifi/web/api/dto/RelationshipDTO.java | 3 +- .../dto/RemoteProcessGroupContentsDTO.java | 5 +- .../web/api/dto/RemoteProcessGroupDTO.java | 2 +- .../api/dto/RemoteProcessGroupPortDTO.java | 3 +- .../nifi/web/api/dto/ReportingTaskDTO.java | 2 +- .../apache/nifi/web/api/dto/ResourceDTO.java | 2 +- .../apache/nifi/web/api/dto/RevisionDTO.java | 2 +- .../apache/nifi/web/api/dto/SnippetDTO.java | 7 +- .../nifi/web/api/dto/StateEntryDTO.java | 2 +- .../apache/nifi/web/api/dto/StateMapDTO.java | 2 +- .../web/api/dto/SystemDiagnosticsDTO.java | 5 +- .../api/dto/SystemDiagnosticsSnapshotDTO.java | 2 +- .../apache/nifi/web/api/dto/TemplateDTO.java | 2 +- .../apache/nifi/web/api/dto/TenantDTO.java | 2 +- .../org/apache/nifi/web/api/dto/UserDTO.java | 2 +- .../apache/nifi/web/api/dto/UserGroupDTO.java | 2 +- .../apache/nifi/web/api/dto/VariableDTO.java | 2 +- .../nifi/web/api/dto/VariableRegistryDTO.java | 2 +- .../dto/VariableRegistryUpdateRequestDTO.java | 2 +- .../dto/VariableRegistryUpdateStepDTO.java | 4 +- .../nifi/web/api/dto/WritablePermission.java | 2 +- .../nifi/web/api/dto/action/ActionDTO.java | 2 +- .../nifi/web/api/dto/action/HistoryDTO.java | 11 +- .../web/api/dto/action/HistoryQueryDTO.java | 2 +- .../details/ExtensionDetailsDTO.java | 3 +- .../details/RemoteProcessGroupDetailsDTO.java | 3 +- .../action/details/ConfigureDetailsDTO.java | 3 +- .../dto/action/details/ConnectDetailsDTO.java | 3 +- .../dto/action/details/MoveDetailsDTO.java | 3 +- .../dto/action/details/PurgeDetailsDTO.java | 7 +- .../web/api/dto/flow/FlowBreadcrumbDTO.java | 2 +- .../apache/nifi/web/api/dto/flow/FlowDTO.java | 2 +- .../web/api/dto/flow/ProcessGroupFlowDTO.java | 2 +- .../web/api/dto/provenance/AttributeDTO.java | 3 +- .../web/api/dto/provenance/ProvenanceDTO.java | 2 +- .../dto/provenance/ProvenanceEventDTO.java | 11 +- .../dto/provenance/ProvenanceOptionsDTO.java | 5 +- .../dto/provenance/ProvenanceRequestDTO.java | 2 +- .../dto/provenance/ProvenanceResultsDTO.java | 2 +- .../ProvenanceSearchableFieldDTO.java | 3 +- .../dto/provenance/lineage/LineageDTO.java | 7 +- .../provenance/lineage/LineageRequestDTO.java | 3 +- .../provenance/lineage/LineageResultsDTO.java | 5 +- .../provenance/lineage/ProvenanceLinkDTO.java | 7 +- .../provenance/lineage/ProvenanceNodeDTO.java | 9 +- .../nifi/web/api/dto/remote/PeerDTO.java | 2 +- .../dto/search/ComponentSearchResultDTO.java | 5 +- .../api/dto/search/NodeSearchResultDTO.java | 3 +- .../web/api/dto/search/SearchResultsDTO.java | 5 +- .../web/api/dto/status/ClusterStatusDTO.java | 4 +- .../api/dto/status/ConnectionStatusDTO.java | 2 +- .../status/ConnectionStatusSnapshotDTO.java | 2 +- .../api/dto/status/ControllerStatusDTO.java | 2 +- .../NodeConnectionStatusSnapshotDTO.java | 4 +- .../web/api/dto/status/NodePortStatusDTO.java | 5 +- .../dto/status/NodePortStatusSnapshotDTO.java | 4 +- .../NodeProcessGroupStatusSnapshotDTO.java | 3 +- .../NodeProcessorStatusSnapshotDTO.java | 4 +- ...deRemoteProcessGroupStatusSnapshotDTO.java | 4 +- .../web/api/dto/status/NodeStatusDTO.java | 5 +- .../dto/status/NodeStatusSnapshotsDTO.java | 2 +- .../web/api/dto/status/PortStatusDTO.java | 3 +- .../api/dto/status/PortStatusSnapshotDTO.java | 2 +- .../api/dto/status/ProcessGroupStatusDTO.java | 2 +- .../status/ProcessGroupStatusSnapshotDTO.java | 2 +- .../api/dto/status/ProcessorStatusDTO.java | 2 +- .../status/ProcessorStatusSnapshotDTO.java | 2 +- .../status/RemoteProcessGroupStatusDTO.java | 2 +- .../RemoteProcessGroupStatusSnapshotDTO.java | 2 +- .../api/dto/status/StatusDescriptorDTO.java | 5 +- .../web/api/dto/status/StatusHistoryDTO.java | 2 +- .../web/api/dto/status/StatusSnapshotDTO.java | 5 +- .../web/api/entity/AccessPolicyEntity.java | 2 +- .../nifi/web/api/entity/ActionEntity.java | 7 +- .../ActivateControllerServicesEntity.java | 8 +- .../nifi/web/api/entity/BulletinEntity.java | 2 +- .../nifi/web/api/entity/ComponentEntity.java | 2 +- .../api/entity/ComponentReferenceEntity.java | 2 +- .../web/api/entity/ComponentStateEntity.java | 2 +- .../nifi/web/api/entity/ConnectionEntity.java | 2 +- .../ConnectionStatusSnapshotEntity.java | 2 +- .../api/entity/ControllerBulletinsEntity.java | 2 +- .../entity/ControllerConfigurationEntity.java | 2 +- .../api/entity/ControllerServicesEntity.java | 2 +- .../api/entity/CopySnippetRequestEntity.java | 2 +- .../entity/CreateTemplateRequestEntity.java | 2 +- .../web/api/entity/CurrentUserEntity.java | 2 +- .../web/api/entity/FlowBreadcrumbEntity.java | 2 +- .../api/entity/FlowConfigurationEntity.java | 2 +- .../InstantiateTemplateRequestEntity.java | 2 +- .../nifi/web/api/entity/PortEntity.java | 2 +- .../api/entity/PortStatusSnapshotEntity.java | 2 +- .../web/api/entity/ProcessGroupEntity.java | 2 +- .../api/entity/ProcessGroupFlowEntity.java | 2 +- .../ProcessGroupStatusSnapshotEntity.java | 2 +- .../nifi/web/api/entity/ProcessorEntity.java | 2 +- .../entity/ProcessorStatusSnapshotEntity.java | 2 +- .../api/entity/RemoteProcessGroupEntity.java | 6 +- ...emoteProcessGroupStatusSnapshotEntity.java | 2 +- .../api/entity/ScheduleComponentsEntity.java | 8 +- .../nifi/web/api/entity/SnippetEntity.java | 2 +- .../api/entity/SubmitReplayRequestEntity.java | 2 +- .../nifi/web/api/entity/TemplatesEntity.java | 2 +- ...ntrollerServiceReferenceRequestEntity.java | 2 +- .../nifi/web/api/entity/UsersEntity.java | 2 +- .../nifi/web/api/entity/VariableEntity.java | 6 +- .../api/entity/VariableRegistryEntity.java | 3 +- .../VariableRegistryUpdateRequestEntity.java | 3 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi/web/api/AccessPolicyResource.java | 24 ++--- .../apache/nifi/web/api/AccessResource.java | 8 +- .../nifi/web/api/ConnectionResource.java | 30 +++--- .../nifi/web/api/ControllerResource.java | 40 +++---- .../web/api/ControllerServiceResource.java | 36 +++---- .../apache/nifi/web/api/CountersResource.java | 16 +-- .../nifi/web/api/DataTransferResource.java | 26 ++--- .../nifi/web/api/FlowFileQueueResource.java | 28 ++--- .../org/apache/nifi/web/api/FlowResource.java | 96 ++++++++--------- .../apache/nifi/web/api/FunnelResource.java | 20 ++-- .../nifi/web/api/InputPortResource.java | 20 ++-- .../apache/nifi/web/api/LabelResource.java | 20 ++-- .../nifi/web/api/OutputPortResource.java | 20 ++-- .../nifi/web/api/ProcessGroupResource.java | 100 +++++++++--------- .../nifi/web/api/ProcessorResource.java | 30 +++--- .../nifi/web/api/ProvenanceEventResource.java | 22 ++-- .../nifi/web/api/ProvenanceResource.java | 34 +++--- .../web/api/RemoteProcessGroupResource.java | 24 ++--- .../nifi/web/api/ReportingTaskResource.java | 30 +++--- .../apache/nifi/web/api/ResourceResource.java | 12 +-- .../nifi/web/api/SiteToSiteResource.java | 14 +-- .../apache/nifi/web/api/SnippetResource.java | 22 ++-- .../web/api/SystemDiagnosticsResource.java | 14 +-- .../apache/nifi/web/api/TemplateResource.java | 18 ++-- .../apache/nifi/web/api/TenantsResource.java | 34 +++--- pom.xml | 4 +- 189 files changed, 647 insertions(+), 633 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml index 05e9fffdcc12..b47b2bcb4457 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml @@ -23,7 +23,7 @@ nifi-client-dto - com.wordnik + io.swagger swagger-annotations diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java index c33b6ab144a8..d9bf5226daa7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import org.apache.nifi.web.api.dto.util.TimezoneAdapter; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessConfigurationDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessConfigurationDTO.java index 3c1591222086..1f72764fb3a7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessConfigurationDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessConfigurationDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicyDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicyDTO.java index 4f9653f281ca..3b5365dec1ef 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicyDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicyDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.TenantEntity; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicySummaryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicySummaryDTO.java index 21c8c43ac431..01f4db10c4df 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicySummaryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessPolicySummaryDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.ComponentReferenceEntity; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessStatusDTO.java index fa334c4d5d70..137f95b87336 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AccessStatusDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlRootElement; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AffectedComponentDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AffectedComponentDTO.java index 28999a51cf3b..3567b53e172b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AffectedComponentDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AffectedComponentDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.Collection; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AllowableValueDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AllowableValueDTO.java index 61571537b449..5ea86ca9645e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AllowableValueDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AllowableValueDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java index c0a691b93034..80053b9134ec 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BatchSettingsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BatchSettingsDTO.java index e1d63f813d89..67e3113ec2d9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BatchSettingsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BatchSettingsDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java index f638d736b03c..ca19d70d8aff 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java @@ -16,14 +16,14 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimeAdapter; +import org.apache.nifi.web.api.entity.BulletinEntity; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.nifi.web.api.dto.util.TimeAdapter; -import org.apache.nifi.web.api.entity.BulletinEntity; +import java.util.Date; +import java.util.List; /** * The contents for the bulletin board including the bulletins and the timestamp when the board was generated. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java index 7d509e637807..ca83de4ed4d4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java index e47cdf905890..cbea34a6a4b0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BundleDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BundleDTO.java index de8231d1ba7c..4b06ba72a0e4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BundleDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BundleDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.Objects; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java index 03776cec80e8..c8dc11d28b45 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java @@ -16,13 +16,13 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Collection; -import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimeAdapter; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.nifi.web.api.dto.util.TimeAdapter; +import java.util.Collection; +import java.util.Date; /** * Details about the composition of the cluster at a specific date/time. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterSummaryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterSummaryDTO.java index 7eb2a76588a2..f5ed8ab223ec 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterSummaryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterSummaryDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentDTO.java index dfbca3d63859..2feefd7d2f9c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java index 7cf4f73fc2d1..6cd82b9e6215 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java @@ -16,9 +16,10 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Map; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; +import java.util.Map; /** * History of a component's properties. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentReferenceDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentReferenceDTO.java index 48aacaa9ebb0..e6c41d38555f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentReferenceDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentReferenceDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentStateDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentStateDTO.java index 9036d5377616..6bb8f6b6003c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentStateDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentStateDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java index ea29527cb5db..b820479fc0d8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java index 79e3cdf84f8a..a2272e07367f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + +import javax.xml.bind.annotation.XmlType; import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.XmlType; /** * A connection between two connectable components. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java index 739679dbfc25..61b037ffa963 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java index a235b36d94f4..675836c83dfe 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java @@ -16,9 +16,10 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Set; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; +import java.util.Set; /** * Configuration details for a NiFi controller. Primary use of this DTO is for consumption by a remote NiFi instance to initiate site to site communications. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceApiDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceApiDTO.java index 63347fa47665..cfc5bc979001 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceApiDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceApiDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.Objects; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java index ff3315dd7f64..571598cbdc90 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentEntity; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java index 6279ac33f824..9e48d740713d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentEntity; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java index b3315b9e6b63..79fc83ed3365 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java index e21d331f9489..1d2ea7890984 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java @@ -17,11 +17,10 @@ package org.apache.nifi.web.api.dto; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; - -import com.wordnik.swagger.annotations.ApiModelProperty; +import java.util.List; @XmlType(name = "counters") public class CountersDTO { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java index cdcdb0c75186..83174d3da121 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersSnapshotDTO.java @@ -16,19 +16,16 @@ */ package org.apache.nifi.web.api.dto; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimeAdapter; + +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.apache.nifi.web.api.dto.util.TimeAdapter; - -import com.wordnik.swagger.annotations.ApiModelProperty; - - /** * All the counters in this NiFi instance at a given time. */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DimensionsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DimensionsDTO.java index 58df0c05db30..4b885a2b87c6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DimensionsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DimensionsDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java index 739d66270bce..7f38a08ba61b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.List; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java index 8b16da0478e2..509813ee381a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DropRequestDTO.java @@ -16,11 +16,12 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimestampAdapter; + import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.nifi.web.api.dto.util.TimestampAdapter; +import java.util.Date; /** * A request to drop the contents of a connection. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java index fa039fefaf76..657d76046806 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowConfigurationDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java index 6e028322b9cf..1bef4ffc79a0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.Map; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileSummaryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileSummaryDTO.java index 2a8a1f1975bc..2113231a236a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileSummaryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowFileSummaryDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java index 33296f894ce6..c4b34f20cabd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.nio.charset.StandardCharsets; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java index 1fbd37763c5d..81c6e393257a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java @@ -16,10 +16,10 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Map; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; +import java.util.Map; /** * Details of a label. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java index abc8890b94be..c00fc13c4f83 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ListingRequestDTO.java @@ -16,16 +16,14 @@ */ package org.apache.nifi.web.api.dto; -import java.util.Date; -import java.util.List; - -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimeAdapter; import org.apache.nifi.web.api.dto.util.TimestampAdapter; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.Date; +import java.util.List; @XmlType(name = "listingRequest") public class ListingRequestDTO { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeCountersSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeCountersSnapshotDTO.java index b7f19c74e102..2e8f787412c3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeCountersSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeCountersSnapshotDTO.java @@ -17,9 +17,9 @@ package org.apache.nifi.web.api.dto; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; @XmlType(name = "nodeProcessorStatusSnapshot") public class NodeCountersSnapshotDTO implements Cloneable { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java index f6a6cf602b65..8528fe9d2da9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java index 235ce58a8abb..19ed80c0ffac 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java @@ -16,11 +16,12 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.DateTimeAdapter; + import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.nifi.web.api.dto.util.DateTimeAdapter; +import java.util.Date; /** * A event for a node within this NiFi cluster. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsSnapshotDTO.java index f27b05d1eef8..355e26b07c7e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsSnapshotDTO.java @@ -17,9 +17,9 @@ package org.apache.nifi.web.api.dto; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; @XmlType(name = "nodeSystemDiagnosticsSnapshot") public class NodeSystemDiagnosticsSnapshotDTO implements Cloneable { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PermissionsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PermissionsDTO.java index ca00605bedfb..10bc81185ff9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PermissionsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PermissionsDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java index f8e4081c57de..b91795773cac 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + +import javax.xml.bind.annotation.XmlType; import java.util.Collection; import java.util.Set; -import javax.xml.bind.annotation.XmlType; /** * The details for a port within this NiFi flow. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java index ef42387f7b71..8e16bf99ed80 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java index 43e16040b86c..943d6daae41c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java index f4b6f31f9625..c8e4a39323d1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java @@ -16,11 +16,10 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; - -import java.util.Map; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; +import java.util.Map; /** * The details for a process group within this NiFi flow. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java index 1e4e92f77748..476c0397c000 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java @@ -16,11 +16,11 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Map; -import java.util.Set; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; +import java.util.Map; +import java.util.Set; /** * Configuration details for a processor in this NiFi. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java index 4a0f4fb42eb9..b3a6c5ee0269 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.Collection; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java index a1f121d6b72f..3e31d60825ef 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.AllowableValueEntity; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java index 35c829389dfc..2ecaa8c08eb2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java @@ -16,9 +16,10 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; +import java.util.List; /** * History of a processor property. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/QueueSizeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/QueueSizeDTO.java index cc46c579a4d4..44cab47132d5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/QueueSizeDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/QueueSizeDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReadablePermission.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReadablePermission.java index 536c23c3bd9f..e9f2bd791830 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReadablePermission.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReadablePermission.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; public interface ReadablePermission { @ApiModelProperty( diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java index ff5729af6ced..ea487d2c04b0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java index 261a84407ad2..d912703a65a4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java @@ -16,9 +16,10 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Set; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; +import java.util.Set; /** * Contents of a remote process group. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java index ee64b69f526c..7641ea06b4b8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java index 2a34d9c7e907..83bd59eb78f6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java index d44bf25a2211..22bfafb46800 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.Collection; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ResourceDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ResourceDTO.java index 9560c136271b..875924b12809 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ResourceDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ResourceDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java index e50e6e1ab1e4..d6871a298f49 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java index a617cf9a8d45..6f63e7e1f143 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java @@ -16,12 +16,11 @@ */ package org.apache.nifi.web.api.dto; -import java.util.HashMap; -import java.util.Map; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; - -import com.wordnik.swagger.annotations.ApiModelProperty; +import java.util.HashMap; +import java.util.Map; /** * The contents of a snippet of a flow. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateEntryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateEntryDTO.java index 93d9c3d2aca0..a8b3362a6ec3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateEntryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateEntryDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateMapDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateMapDTO.java index 6f67287975c8..c50512694686 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateMapDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/StateMapDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.List; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java index 40a04d420a24..254e590f5d82 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java @@ -17,11 +17,10 @@ package org.apache.nifi.web.api.dto; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; - -import com.wordnik.swagger.annotations.ApiModelProperty; +import java.util.List; @XmlType(name = "systemDiagnostics") public class SystemDiagnosticsDTO { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java index 294977674d34..9bc6cfb9fbed 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsSnapshotDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import org.apache.nifi.web.api.dto.util.TimeAdapter; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java index b36e63dc529c..7651c7c358f3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import javax.xml.bind.annotation.XmlAttribute; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TenantDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TenantDTO.java index cc444036f631..1dd1d6c17b75 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TenantDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TenantDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java index e86630c86e5d..3a2113eb1bf3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.AccessPolicySummaryEntity; import org.apache.nifi.web.api.entity.TenantEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java index 17de4ded7caf..797844592d32 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.AccessPolicyEntity; import org.apache.nifi.web.api.entity.TenantEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableDTO.java index 89ea27a0b846..f119e107631f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.AffectedComponentEntity; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryDTO.java index 8f37532ec9d5..87af55717df0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.VariableEntity; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateRequestDTO.java index e57e30a1d2bf..24400e616f38 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateRequestDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimestampAdapter; import org.apache.nifi.web.api.entity.AffectedComponentEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateStepDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateStepDTO.java index e1c8cee9764d..81e0057f4ba9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateStepDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/VariableRegistryUpdateStepDTO.java @@ -17,9 +17,9 @@ package org.apache.nifi.web.api.dto; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; @XmlType(name = "varaibleRegistryUpdateStep") public class VariableRegistryUpdateStepDTO { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/WritablePermission.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/WritablePermission.java index 3eb286e9a658..26191c22c41b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/WritablePermission.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/WritablePermission.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; public interface WritablePermission { @ApiModelProperty( diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java index 28279264dce3..5aedbc41b251 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.action; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.action.component.details.ComponentDetailsDTO; import org.apache.nifi.web.api.dto.action.details.ActionDetailsDTO; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java index bdc121ce47e7..ff06dcdbfe57 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java @@ -16,14 +16,15 @@ */ package org.apache.nifi.web.api.dto.action; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Collection; -import java.util.Date; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimeAdapter; import org.apache.nifi.web.api.entity.ActionEntity; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.Collection; +import java.util.Date; + /** * NiFi action history. */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java index 7fb961543e0c..d79117353ce5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.action; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java index 81f87c17660e..a1eaabd2061b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.action.component.details; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java index 0d0bc06d40b3..f833e15588e8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.action.component.details; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java index 7b79bd09dec3..709841cfe771 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.action.details; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java index db2804ff98be..6854341c6a0f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.action.details; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java index f6984a87e7fc..195d92e0b461 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.action.details; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java index dec6964274f6..8281b061b038 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java @@ -16,11 +16,12 @@ */ package org.apache.nifi.web.api.dto.action.details; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.DateTimeAdapter; + import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.nifi.web.api.dto.util.DateTimeAdapter; +import java.util.Date; /** * Details of a purge operation. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowBreadcrumbDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowBreadcrumbDTO.java index a6f12d7e0bd5..170a30f7e588 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowBreadcrumbDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowBreadcrumbDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.flow; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowDTO.java index 557d72fd805a..f18a8a6c5b42 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/FlowDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.flow; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.ConnectionEntity; import org.apache.nifi.web.api.entity.FunnelEntity; import org.apache.nifi.web.api.entity.LabelEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java index f24ed3c309a4..2ef6115aaedd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/flow/ProcessGroupFlowDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.flow; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimeAdapter; import org.apache.nifi.web.api.entity.FlowBreadcrumbEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java index 8228ac3ee6d4..2e2e50bac01c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.provenance; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java index 1a3643f358bc..6d2438c6df46 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.provenance; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.TimestampAdapter; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java index afecf3fcfadf..518bf24c12f0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java @@ -16,15 +16,14 @@ */ package org.apache.nifi.web.api.dto.provenance; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Collection; -import java.util.Date; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimestampAdapter; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.apache.nifi.web.api.dto.util.TimestampAdapter; +import java.util.Collection; +import java.util.Date; +import java.util.List; /** * A provenance event. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java index edd414fa54c3..eb93ad5f676a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java @@ -16,9 +16,10 @@ */ package org.apache.nifi.web.api.dto.provenance; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; +import java.util.List; /** * A provenance search options. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java index ae54a15ec73f..7a3a0ffb6a04 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.provenance; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java index 8db81f0f9267..eee17c2b5266 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.provenance; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; import org.apache.nifi.web.api.dto.util.TimeAdapter; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java index 05a707e337f6..5ec53b05dabe 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.provenance; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java index a2d9cbd2a496..d0e620423b12 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java @@ -16,11 +16,12 @@ */ package org.apache.nifi.web.api.dto.provenance.lineage; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimestampAdapter; + import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.nifi.web.api.dto.util.TimestampAdapter; +import java.util.Date; /** * Represents the lineage for a flowfile. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java index 5473efd34dc1..dc5d54822097 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.provenance.lineage; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java index 0ac4479ff637..22cce999344a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.web.api.dto.provenance.lineage; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + +import javax.xml.bind.annotation.XmlType; import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.XmlType; /** * Represents the lineage results. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java index 3e0da69c4f16..d0c8201cff3e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java @@ -16,11 +16,12 @@ */ package org.apache.nifi.web.api.dto.provenance.lineage; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimestampAdapter; + import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.apache.nifi.web.api.dto.util.TimestampAdapter; +import java.util.Date; /** * A link between an event or flowfile within a provenance lineage. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java index d2c428afde59..f8f860cfa5a8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java @@ -16,14 +16,13 @@ */ package org.apache.nifi.web.api.dto.provenance.lineage; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Date; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; +import org.apache.nifi.web.api.dto.util.TimestampAdapter; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.apache.nifi.web.api.dto.util.TimestampAdapter; +import java.util.Date; +import java.util.List; /** * A node within a provenance lineage. May represent either an event or a flowfile. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/remote/PeerDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/remote/PeerDTO.java index 7d76f1767a8a..618459446988 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/remote/PeerDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/remote/PeerDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.remote; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java index 8e9cba56d784..7cddd7e8a412 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java @@ -16,9 +16,10 @@ */ package org.apache.nifi.web.api.dto.search; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.List; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; +import java.util.List; /** * The components that match a search performed on this NiFi. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java index 554966ecc4af..ff8f79c10434 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java @@ -16,7 +16,8 @@ */ package org.apache.nifi.web.api.dto.search; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + import javax.xml.bind.annotation.XmlType; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java index 60e5bddffdbe..acad58b5667f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.web.api.dto.search; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + +import javax.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlType; /** * The results of a search on this NiFi. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java index 73529d06dbd1..28d452bfcf00 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java @@ -16,10 +16,10 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; -import java.util.Collection; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; +import java.util.Collection; /** * DTO for serializing the controller status. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java index ee23f38fbea6..474f7172b1aa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto.status; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java index 6a474a124b21..7ba93cc7b7e2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusSnapshotDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java index c6d7585e8018..eb315977ec4f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusSnapshotDTO.java index 41f7433704b2..f58b762bccf1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusSnapshotDTO.java @@ -17,9 +17,9 @@ package org.apache.nifi.web.api.dto.status; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; @XmlType(name = "nodeConnectionStatusSnapshot") public class NodeConnectionStatusSnapshotDTO implements Cloneable { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java index 3b37e9d59173..dee88e566b3c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.NodeDTO; +import javax.xml.bind.annotation.XmlType; + /** * DTO for serializing the port status for a particular node. */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusSnapshotDTO.java index a8dc1ff15e01..3cbd87dcde4d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusSnapshotDTO.java @@ -17,9 +17,9 @@ package org.apache.nifi.web.api.dto.status; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; @XmlType(name = "nodePortStatusSnapshot") public class NodePortStatusSnapshotDTO implements Cloneable { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusSnapshotDTO.java index 854b0774d5c7..8f6131a306c0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusSnapshotDTO.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.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; public class NodeProcessGroupStatusSnapshotDTO implements Cloneable { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusSnapshotDTO.java index 5ea4697aa1d5..bcadd498d8f8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusSnapshotDTO.java @@ -16,9 +16,9 @@ */ package org.apache.nifi.web.api.dto.status; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; /** * DTO for serializing the processor status for a particular node. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusSnapshotDTO.java index 57658f2bdeed..7f0cedee367d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusSnapshotDTO.java @@ -17,9 +17,9 @@ package org.apache.nifi.web.api.dto.status; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; -import com.wordnik.swagger.annotations.ApiModelProperty; +import javax.xml.bind.annotation.XmlType; @XmlType(name = "nodeRemoteProcessGroupStatusSnapshot") public class NodeRemoteProcessGroupStatusSnapshotDTO implements Cloneable { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java index 3f07f3dc9fe0..2eb38e2fb821 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; -import javax.xml.bind.annotation.XmlType; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.NodeDTO; +import javax.xml.bind.annotation.XmlType; + /** * DTO for serializing the node status. */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusSnapshotsDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusSnapshotsDTO.java index f70da4a47732..139afe652f5c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusSnapshotsDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusSnapshotsDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; import java.util.List; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java index ed03bceef1e2..eb884906ca40 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.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.dto.status; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusSnapshotDTO.java index 9e3093198ce4..fa740d3b4a45 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusSnapshotDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java index 609c24f5e1ec..9c135a76e1fc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto.status; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java index 4eba583c82dd..3ae63550d459 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusSnapshotDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.entity.ConnectionStatusSnapshotEntity; import org.apache.nifi.web.api.entity.PortStatusSnapshotEntity; import org.apache.nifi.web.api.entity.ProcessGroupStatusSnapshotEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java index 3f140310ee74..d4d6fdf22d77 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto.status; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java index 73bc85eddce5..df999b18952a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusSnapshotDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java index a13749a00fb2..b71c42ad0daa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java @@ -17,7 +17,7 @@ package org.apache.nifi.web.api.dto.status; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusSnapshotDTO.java index 3693d6609e40..c7893cc48ab4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusSnapshotDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java index 34ee3150dd90..e3cc02a54933 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java @@ -16,11 +16,10 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; - -import java.util.Objects; +import io.swagger.annotations.ApiModelProperty; import javax.xml.bind.annotation.XmlType; +import java.util.Objects; /** * DTO for serializing a status descriptor. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java index 9c7b7e1ec579..7a0cb77f2195 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.web.api.dto.status; -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.XmlType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java index 24d801fdcb55..96b3495878a3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java @@ -16,10 +16,11 @@ */ package org.apache.nifi.web.api.dto.status; -import com.wordnik.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + +import javax.xml.bind.annotation.XmlType; import java.util.Date; import java.util.Map; -import javax.xml.bind.annotation.XmlType; /** * A snapshot of the status at a given time. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.java index 19d831dbffa9..719ee0d80676 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/AccessPolicyEntity.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.AccessPolicyDTO; import org.apache.nifi.web.api.dto.util.TimeAdapter; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java index 3a6aa2140a05..8358912188f9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActionEntity.java @@ -16,14 +16,13 @@ */ package org.apache.nifi.web.api.entity; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -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.action.ActionDTO; import org.apache.nifi.web.api.dto.util.DateTimeAdapter; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Date; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActivateControllerServicesEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActivateControllerServicesEntity.java index a58f82168126..d43ad233f7e0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActivateControllerServicesEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ActivateControllerServicesEntity.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; @XmlRootElement(name = "activateControllerServicesEntity") public class ActivateControllerServicesEntity extends Entity { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinEntity.java index 83f45d12107e..6c773c0ba6a2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BulletinEntity.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.BulletinDTO; import org.apache.nifi.web.api.dto.ReadablePermission; import org.apache.nifi.web.api.dto.util.TimeAdapter; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentEntity.java index 0d818733e473..fca49ce98df8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentEntity.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.PositionDTO; import org.apache.nifi.web.api.dto.RevisionDTO; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentReferenceEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentReferenceEntity.java index bc03ad8a5b21..7ed176aa24f6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentReferenceEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentReferenceEntity.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.ComponentReferenceDTO; import javax.xml.bind.annotation.XmlRootElement; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentStateEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentStateEntity.java index 992a805699fa..878c69c318a6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentStateEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ComponentStateEntity.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.ComponentStateDTO; import javax.xml.bind.annotation.XmlRootElement; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java index 6e4b25c52f20..f7bef1f6e2e4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionEntity.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.ConnectionDTO; import org.apache.nifi.web.api.dto.PositionDTO; import org.apache.nifi.web.api.dto.status.ConnectionStatusDTO; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionStatusSnapshotEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionStatusSnapshotEntity.java index 9e1374ad4b62..2f6a671edef7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionStatusSnapshotEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ConnectionStatusSnapshotEntity.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.ConnectionStatusSnapshotDTO; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerBulletinsEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerBulletinsEntity.java index 03d1a6902e87..656029224c87 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerBulletinsEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerBulletinsEntity.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; import java.util.ArrayList; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.java index b01acd3cb231..3d5779273de9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerConfigurationEntity.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.ControllerConfigurationDTO; import org.apache.nifi.web.api.dto.PermissionsDTO; import org.apache.nifi.web.api.dto.RevisionDTO; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java index 7d7b23644e55..00ab2022a484 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ControllerServicesEntity.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; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CopySnippetRequestEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CopySnippetRequestEntity.java index a20fee31c112..4917c8063ae9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CopySnippetRequestEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/CopySnippetRequestEntity.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; 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 865631a95db2..1e0ffb35d4a5 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; 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 d24ce67df804..6b8e28f6b7db 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; 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 4b042f7599d3..b97b9b3e4078 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; 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 54af4d4e179f..52b01d40d0d4 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; 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 8945f36f9d7a..d140105c15a9 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; 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 ff77979497ea..2454af189073 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; 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 d44fab4ecb27..2628e3be8a75 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; 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 c16c5c9c3eed..83af9d8fa6ce 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; 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 ebcb0f857252..9bdd5123f9a9 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; 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 6434b326fd87..9522a3dd4123 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; 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 bfea1b5333a1..3607c0b91673 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; 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 57b8636304d2..e59b34c75c4a 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; 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 ee44c274866c..8b049a44ea52 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. */ 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 54bf45b99a8a..6dcfe7d27f56 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; 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 3e4c9a42a366..280d015f9268 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. 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 7ec8de6d4b59..867ac61a1d0d 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; 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 f491e0d24c96..2297b56eecb2 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; 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 b6a2bc444159..fde2baf8a829 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; 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 d58b1ef33d46..2a431689c24f 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; 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 19c3448e3311..802f19451071 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; 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 06f6fcfc2954..ce56367e8c35 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 { 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 1b7da0c17d31..142ce2205bb5 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; 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 bfeb9ce07bf3..8b0e4cfed6e5 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; 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 55a68de20132..4dfc2cd9ade3 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 @@ com.github.kongchen swagger-maven-plugin - 3.0.1 + 3.1.5 compile @@ -226,7 +226,7 @@ provided - com.wordnik + io.swagger swagger-annotations provided 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 2e7105867c88..1f4a26080854 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 AccessPolicyEntity populateRemainingAccessPolicyEntityContent(AccessPolic + "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 Response getAccessPolicyForResource( 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 Response createAccessPolicy( 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 Response getAccessPolicy( 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 Response updateAccessPolicy( 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( 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 3031e2e31375..ddb4dcebcb63 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.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; 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 70046db91228..773d8a6d4a98 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 ConnectionEntity populateRemainingConnectionEntityContent(ConnectionEntit 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 Response getConnection( 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 Response updateConnection( 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( 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 97cb4c954e05..23ac3cdf39a4 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 @@ private void authorizeController(final RequestAction action) { 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 Response getControllerConfig() { 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 Response updateControllerConfig( 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 Response createReportingTask( value = "Creates a new bulletin", response = BulletinEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = "") + @Authorization(value = "Write - /controller") } ) @ApiResponses( @@ -378,9 +378,9 @@ public Response createBulletin( 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 Response createControllerService( 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 Response getCluster() { 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 Response getNode( 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 Response updateNode( 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 Response deleteNode( value = "Purges history", response = HistoryEntity.class, authorizations = { - @Authorization(value = "Write - /controller", type = "") + @Authorization(value = "Write - /controller") } ) @ApiResponses( 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 fdaff5ab2644..dd41521d24b8 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 ControllerServiceDTO populateRemainingControllerServiceContent(final Cont 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 Response getControllerService( 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 Response getPropertyDescriptor( 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 Response getState( 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 Response clearState( 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 Response getControllerServiceReferences( 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 Response updateControllerServiceReferences( 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 Response updateControllerService( 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( 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 903b10246370..028e6a1c9058 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 @@ private void authorizeCounters(final RequestAction action) { notes = NON_GUARANTEED_ENDPOINT, response = CountersEntity.class, authorizations = { - @Authorization(value = "Read - /counters", type = "") + @Authorization(value = "Read - /counters") } ) @ApiResponses( @@ -183,7 +183,7 @@ public Response getCounters( notes = NON_GUARANTEED_ENDPOINT, response = CounterEntity.class, authorizations = { - @Authorization(value = "Write - /counters", type = "") + @Authorization(value = "Write - /counters") } ) @ApiResponses( 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 897ff7ad9e0b..bf55c05439cd 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 @@ protected void authorizeDataTransfer(final AuthorizableLookup lookup, final Reso 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 Response createPortTransaction( 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 @@ private Peer constructPeer(final HttpServletRequest req, final InputStream input 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 Response commitOutputPortTransaction( 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 @@ private Response cancelTransaction(String transactionId, TransactionResultEntity 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 void write(OutputStream outputStream) throws IOException, WebApplicationE 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 Response extendInputPortTransactionTTL( 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( 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 1017aca052ee..cb45c70c4701 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 FlowFileSummaryDTO populateRemainingFlowFileContent(final String connecti 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 Response getFlowFile( 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 void write(final OutputStream output) throws IOException, WebApplicationE 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 Response createFlowFileListing( 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 Response getListingRequest( 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 String getListingRequestId() { 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 Response createDropRequest( 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 Response getDropRequest( 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( 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 5d5a796567e1..378e3818b457 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 @@ private void authorizeFlow() { value = "Generates a client id.", response = String.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -249,7 +249,7 @@ public Response generateClientId() { 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 Response getFlowConfig() { 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 Response getCurrentUser() { value = "Gets a process group", response = ProcessGroupFlowEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -372,7 +372,7 @@ public Response getFlow( value = "Gets all controller services", response = ControllerServicesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -418,7 +418,7 @@ public Response getControllerServicesFromController() { value = "Gets all controller services", response = ControllerServicesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -471,7 +471,7 @@ public Response getControllerServicesFromGroup( value = "Gets all reporting tasks", response = ReportingTasksEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -518,8 +518,8 @@ public Response getReportingTasks() { 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 Response scheduleComponents( @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 Response activateControllerServices( 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 Response searchFlow(@QueryParam("q") @DefaultValue(StringUtils.EMPTY) Str 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 Response getControllerStatus() throws InterruptedException { 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 Response getClusterSummary() throws InterruptedException { 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 Response getBulletins() { 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 Response getBanners() { notes = NON_GUARANTEED_ENDPOINT, response = ProcessorTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1073,7 +1073,7 @@ public Response getProcessorTypes( notes = NON_GUARANTEED_ENDPOINT, response = ControllerServiceTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1157,7 +1157,7 @@ public Response getControllerServiceTypes( notes = NON_GUARANTEED_ENDPOINT, response = ReportingTaskTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1214,7 +1214,7 @@ public Response getReportingTaskTypes( notes = NON_GUARANTEED_ENDPOINT, response = PrioritizerTypesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -1253,7 +1253,7 @@ public Response getPrioritizers() throws InterruptedException { 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 Response getAboutInfo() { 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 Response getBulletinBoard( 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 Response getProcessorStatus( 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 Response getInputPortStatus( 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 Response getOutputPortStatus( 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 Response getRemoteProcessGroupStatus( + "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 Response getProcessGroupStatus( 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 Response getConnectionStatus( 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 Response getProcessorStatusHistory( 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 Response getProcessGroupStatusHistory( value = "Gets the status history", response = StatusHistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2015,7 +2015,7 @@ public Response getRemoteProcessGroupStatusHistory( 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 Response getConnectionStatusHistory( notes = NON_GUARANTEED_ENDPOINT, response = HistoryEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2222,7 +2222,7 @@ public Response queryHistory( notes = NON_GUARANTEED_ENDPOINT, response = ActionEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2272,8 +2272,8 @@ public Response getAction( 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 Response getComponentHistory( value = "Gets all templates", response = TemplatesEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( @@ -2406,7 +2406,7 @@ public Response getTemplates() { notes = NON_GUARANTEED_ENDPOINT, response = ClusterSearchResultsEntity.class, authorizations = { - @Authorization(value = "Read - /flow", type = "") + @Authorization(value = "Read - /flow") } ) @ApiResponses( 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 3547c1726ceb..787d23e8518c 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 FunnelEntity populateRemainingFunnelEntityContent(FunnelEntity funnelEnti 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 Response getFunnel( 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 Response updateFunnel( 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( 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 536590074bad..a9961b7a370e 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 PortEntity populateRemainingInputPortEntityContent(PortEntity inputPortEn 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 Response getInputPort( 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 Response updateInputPort( 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( 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 2816d25c0144..d34eb7470418 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 LabelEntity populateRemainingLabelEntityContent(LabelEntity labelEntity) 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 Response getLabel( 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 Response updateLabel( 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( 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 0c49b0a497fe..bccca5702e4e 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 PortEntity populateRemainingOutputPortEntityContent(PortEntity outputPort 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 Response getOutputPort( 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 Response updateOutputPort( 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( 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 57b76c4e6af5..de1f15b0b0c3 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 @@ 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 @@ private FlowDTO populateRemainingSnippetContent(FlowDTO flow) { 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 Response getProcessGroup( 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 Response getVariableRegistry( 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 Response updateProcessGroup( 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 Response getVariableRegistryUpdateRequest( 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 Response deleteVariableRegistryUpdateRequest( @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 Response updateVariableRegistry( 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 @@ private T getResponseEntity(final NodeResponse nodeResponse, final Class 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 Response removeProcessGroup( 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 Response createProcessGroup( 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 Response getProcessGroups( 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 Response createProcessor( 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 Response getProcessors( 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 Response createInputPort( 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 Response getInputPorts( 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 Response createOutputPort( 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 Response getOutputPorts( 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 Response createFunnel( 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 Response getFunnels( 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 Response createLabel( 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 Response getLabels( 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 Response createRemoteProcessGroup( 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 Response getRemoteProcessGroups( 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 Response createConnection( 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 Response getConnections( 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 @@ private void discoverCompatibleBundles(final FlowSnippetDTO snippet) { 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 @@ private SnippetAuthorizable authorizeSnippetUsage(final AuthorizableLookup looku 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 Response createTemplate( 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 Response uploadTemplate( 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 Response importTemplate( 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( 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 a56241c3c58e..460ed37dc2b6 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 ProcessorDTO populateRemainingProcessorContent(ProcessorDTO processor) { 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 Response getProcessor( 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 Response getPropertyDescriptor( 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 Response getState( 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 Response clearState( 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 Response updateProcessor( 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( 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 559aeac1e867..a62ea51fde9b 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 void write(OutputStream output) throws IOException, WebApplicationExcepti 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 void write(OutputStream output) throws IOException, WebApplicationExcepti 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 Response getProvenanceEvent( 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( 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 55ed489d71c9..40f2c5bd5629 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 @@ private void authorizeProvenanceRequest() { 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 Response getSearchOptions() { + "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 Response submitProvenanceRequest( 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 Response getProvenance( value = "Deletes a provenance query", response = ProvenanceEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = "") + @Authorization(value = "Read - /provenance") } ) @ApiResponses( @@ -414,8 +414,8 @@ public Response deleteProvenance( + "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 Response submitLineageRequest( 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 Response getLineage( value = "Deletes a lineage query", response = LineageEntity.class, authorizations = { - @Authorization(value = "Read - /provenance", type = "") + @Authorization(value = "Read - /provenance") } ) @ApiResponses( 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 fbceee2c5c19..391e469177bc 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 RemoteProcessGroupEntity populateRemainingRemoteProcessGroupEntityContent 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 Response getRemoteProcessGroup( 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 Response removeRemoteProcessGroup( 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 Response updateRemoteProcessGroupInputPort( 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 Response updateRemoteProcessGroupOutputPort( 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( 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 d1b43048edf9..38fd3ff69a3c 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 ReportingTaskDTO populateRemainingReportingTaskContent(final ReportingTas 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 Response getReportingTask( 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 Response getPropertyDescriptor( 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 Response getState( 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 Response clearState( 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 Response updateReportingTask( 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( 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 f957302471d9..58993f497e43 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 @@ private void authorizeResource() { value = "Gets the available resources that support access/authorization policies", response = ResourcesEntity.class, authorizations = { - @Authorization(value = "Read - /resources", type = "") + @Authorization(value = "Read - /resources") } ) @ApiResponses( 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 2e1763702788..36cfda12aa24 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 @@ protected void authorizeSiteToSite() { 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 Response getSiteToSiteDetails(@Context HttpServletRequest req) { 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( 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 5817cd73a3a1..6833428d96c1 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 @@ private void authorizeSnippetRequest(final SnippetDTO snippetRequest, final Auth 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 Response createSnippet( 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 Response updateSnippet( 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( 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 ff69e6084839..8b9fed401b25 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 @@ private void authorizeSystem() { 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( 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 052f75cbb00a..c31daa1cafce 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 TemplateDTO populateRemainingTemplateContent(TemplateDTO template) { 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 Response exportTemplate( 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( 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 080ae5ff56dd..f339e31f380e 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 UserEntity populateRemainingUserEntityContent(UserEntity userEntity) { notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -214,7 +214,7 @@ public Response createUser( notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -269,7 +269,7 @@ public Response getUser( notes = NON_GUARANTEED_ENDPOINT, response = UsersEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -327,7 +327,7 @@ public Response getUsers() { notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -417,7 +417,7 @@ public Response updateUser( notes = NON_GUARANTEED_ENDPOINT, response = UserEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -518,7 +518,7 @@ public UserGroupEntity populateRemainingUserGroupEntityContent(UserGroupEntity u notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -603,7 +603,7 @@ public Response createUserGroup( notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -658,7 +658,7 @@ public Response getUserGroup( notes = NON_GUARANTEED_ENDPOINT, response = UserGroupsEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( @@ -715,7 +715,7 @@ public Response getUserGroups() { notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -805,7 +805,7 @@ public Response updateUserGroup( notes = NON_GUARANTEED_ENDPOINT, response = UserGroupEntity.class, authorizations = { - @Authorization(value = "Write - /tenants", type = "") + @Authorization(value = "Write - /tenants") } ) @ApiResponses( @@ -885,7 +885,7 @@ public Response removeUserGroup( notes = NON_GUARANTEED_ENDPOINT, response = TenantsEntity.class, authorizations = { - @Authorization(value = "Read - /tenants", type = "") + @Authorization(value = "Read - /tenants") } ) @ApiResponses( diff --git a/pom.xml b/pom.xml index 508e0970a5fe..e0e13279a2b0 100644 --- a/pom.xml +++ b/pom.xml @@ -237,9 +237,9 @@ 3.2.2 - com.wordnik + io.swagger swagger-annotations - 1.5.3-M1 + 1.5.16 com.rethinkdb