NIFI-292: - Removing enunciate. - Code clean up. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/45e3c945 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/45e3c945 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/45e3c945
Branch: refs/heads/NIFI-292 Commit: 45e3c945b686184f7d9a9666ed6afa4f9f488451 Parents: 2783a05 Author: Matt Gilman <[email protected]> Authored: Thu Apr 30 20:17:00 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu Apr 30 20:17:00 2015 -0400 ---------------------------------------------------------------------- .../src/main/resources/META-INF/NOTICE | 5 + .../nifi-framework/nifi-client-dto/pom.xml | 21 --- .../nifi-web/nifi-web-api/pom.xml | 57 +----- .../src/main/enunciate/enunciate.xml | 36 ---- .../src/main/enunciate/images/home.png | Bin 144 -> 0 bytes .../src/main/enunciate/override.css | 178 ------------------- .../nifi/web/api/BulletinBoardResource.java | 2 - .../apache/nifi/web/api/ClusterResource.java | 17 -- .../apache/nifi/web/api/ConnectionResource.java | 9 - .../apache/nifi/web/api/ControllerResource.java | 18 -- .../nifi/web/api/ControllerServiceResource.java | 11 -- .../org/apache/nifi/web/api/FunnelResource.java | 8 - .../apache/nifi/web/api/HistoryResource.java | 7 - .../apache/nifi/web/api/InputPortResource.java | 8 - .../org/apache/nifi/web/api/LabelResource.java | 8 - .../org/apache/nifi/web/api/NodeResource.java | 7 - .../apache/nifi/web/api/OutputPortResource.java | 8 - .../nifi/web/api/ProcessGroupResource.java | 15 -- .../apache/nifi/web/api/ProcessorResource.java | 10 -- .../apache/nifi/web/api/ProvenanceResource.java | 12 -- .../web/api/RemoteProcessGroupResource.java | 13 -- .../nifi/web/api/ReportingTaskResource.java | 9 - .../apache/nifi/web/api/SnippetResource.java | 7 - .../nifi/web/api/SystemDiagnosticsResource.java | 2 - .../apache/nifi/web/api/TemplateResource.java | 7 - .../apache/nifi/web/api/UserGroupResource.java | 5 - .../org/apache/nifi/web/api/UserResource.java | 7 - .../src/main/resources/META-INF/NOTICE | 27 --- .../src/main/resources/templates/index.html.hbs | 2 +- nifi/pom.xml | 7 +- 30 files changed, 13 insertions(+), 510 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE index cd0d2a8..6794428 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE @@ -90,6 +90,11 @@ The following binary components are provided under the Apache Software License v Spring Framework 4.1.4.RELEASE Copyright (c) 2002-2014 Pivotal, Inc. + (ASLv2) Swagger Core + The following NOTICE information applies: + Swagger Core 1.5.3-M1 + Copyright 2015 Reverb Technologies, Inc. + ************************ Common Development and Distribution License 1.1 ************************ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml index 3a34460..5499795 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml @@ -21,31 +21,10 @@ <version>0.1.0-incubating-SNAPSHOT</version> </parent> <artifactId>nifi-client-dto</artifactId> - <build> - <plugins> - <!-- - Always attach sources so the enunciate documentation - is complete. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> <dependencies> <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-annotations</artifactId> - <version>1.5.3-M1</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml index 3639016..7484564 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml @@ -23,56 +23,6 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-web-api</artifactId> <packaging>war</packaging> - <profiles> - <profile> - <id>docs</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <resources> - <resource> - <directory>src/main/enunciate/images</directory> - <targetPath>${project.build.directory}/${project.artifactId}-${project.version}/docs/rest-api/img</targetPath> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.codehaus.enunciate</groupId> - <artifactId>maven-enunciate-plugin</artifactId> - <version>1.28</version> - <configuration> - <configFile>src/main/enunciate/enunciate.xml</configFile> - </configuration> - <executions> - <execution> - <goals> - <goal>docs</goal> - </goals> - <configuration> - <docsDir>${project.build.directory}/${project.artifactId}-${project.version}/docs/rest-api</docsDir> - </configuration> - </execution> - </executions> - <!-- - Enunciate currently uses APT to process class annotations. APT - has been deprecated in Java 7. As a result, a direct dependency - must be added to tools.jar where APT is located. - --> - <dependencies> - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.7.0</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> - </profiles> <build> <resources> <resource> @@ -151,11 +101,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.enunciate</groupId> - <artifactId>enunciate-core-annotations</artifactId> - <version>1.28</version> - </dependency> - <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-data-provenance-utils</artifactId> <scope>provided</scope> @@ -231,7 +176,7 @@ <dependency> <groupId>com.wordnik</groupId> <artifactId>swagger-annotations</artifactId> - <version>1.5.3-M1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/enunciate.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/enunciate.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/enunciate.xml deleted file mode 100644 index daaa553..0000000 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/enunciate.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<enunciate label="NiFi" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.28.xsd";> - - <disable-rule id="all.warnings"/> - - <modules> - <c disabled="true"/> - <obj-c disabled="true"/> - <csharp disabled="true"/> - <jaxws-client disabled="true"/> - <jaxws-ri disabled="true"/> - <jaxws-support disabled="true"/> - <xfire-client disabled="true"/> - <rest disabled="true"/> - <jersey useSubcontext="false" usePathBasedConneg="false"/> - <docs splashPackage="org.apache.nifi.web.api" includeDefaultDownloads="false"> - <additional-css file="override.css"/> - </docs> - </modules> -</enunciate> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/images/home.png ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/images/home.png b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/images/home.png deleted file mode 100644 index be12052..0000000 Binary files a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/images/home.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/override.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/override.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/override.css deleted file mode 100644 index 1cd8e7f..0000000 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/enunciate/override.css +++ /dev/null @@ -1,178 +0,0 @@ -/* - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400"; - -html, html a { - -webkit-font-smoothing: antialiased; - text-shadow: 1px 1px 1px rgba(0,0,0,0.004); -} - -#site-name { - padding-left: 0; -} - -#site-name a { - font-variant: normal !important; - letter-spacing: 1px; -} - -#primary { - padding-right: 0; -} - -#primary li:hover { - border-bottom: 6px solid #7098ad; -} - -.xbreadcrumbs { - background-color: #7098ad !important; - color: #fff !important; -} - -.xbreadcrumbs li a, .xbreadcrumbs li.current a { - font-size: 13px !important; - color: #fff !important; -} - -.xbreadcrumbs li a.home { - background: url(img/home.png) no-repeat left center; - line-height: 16px; -} - -.xbreadcrumbs li ul { - top: 26px !important; - background-color: #e3ebee !important; -} - -.xbreadcrumbs li ul li a, .xbreadcrumbs li.current ul li a { - color: #444 !important; -} - -.home { - color: #444; - font-family: "Open Sans","DejaVu Sans",sans-serif !important; -} - -p { - font-family: 'Noto Serif', 'DejaVu Serif', serif; - font-size: 16px; -} - -p strong { - font-weight: bold; -} - -a { - color: #496878; -} - -a:hover { - color: #6a90a4; -} - -.container { - width: 940px !important; - padding: 0 10px; - background-color: #fff; -} - -#main h2, #main h3 { - border-width: 0; -} - -#main p.note { - background-color: #fefefe; - border: 1px solid #ccc; - border-left: 6px solid #ccc; - color: #555; - display: block; - margin-bottom: 12px; - padding: 5px 8px; - font-family: "Open Sans","DejaVu Sans",sans-serif; - font-size: 16px; -} - -ul.navigation li, ul.xbreadcrumbs li { - font-family: "Open Sans","DejaVu Sans",sans-serif; - font-size: 16px; -} - -ul li { - font-family: 'Noto Serif', 'DejaVu Serif', serif; - font-size: 16px; -} - -/* tables */ - -table { - background-color: #fefefe; - border: 1px solid #ccc; - border-left: 6px solid #ccc; - color: #555; - display: block; - margin-bottom: 12px; - padding: 5px 8px; -} - -table tbody tr td { - font-size: 14px; - vertical-align:top; - text-align:left; - padding: 4px; - border-width: 0; -} - -table tbody tr th { - font-size: 16px; - vertical-align:top; - text-align:left; - padding: 4px; - border-width: 0; -} - -/* code */ - -code { - font-size: 14px; - background-color: #fefefe; - border: 1px solid #ccc; - border-left: 6px solid #ccc; - color: #555; - margin-bottom: 10px; - padding: 5px 8px; - white-space: pre; -} - -h1, h2 { - font-weight: normal; - color: #ba3925; -} - -/* footer */ - -#footer { - border-top: 3px solid #eee; -} - -/* width */ - -.span-18 { - width: 921px !important; -} - -.span-20 { - width: 935px !important; -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java index 14b2184..6197953 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java @@ -40,7 +40,6 @@ import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.IntegerParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -75,7 +74,6 @@ public class BulletinBoardResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(BulletinBoardEntity.class) @ApiOperation( value = "Gets current bulletins", response = BulletinBoardEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java index 005a4a2..857df56 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java @@ -77,7 +77,6 @@ import com.wordnik.swagger.annotations.ApiResponses; import com.wordnik.swagger.annotations.Authorization; import org.apache.nifi.web.api.dto.status.ClusterProcessGroupStatusDTO; import org.apache.nifi.web.api.entity.ClusterProcessGroupStatusEntity; -import org.codehaus.enunciate.jaxrs.TypeHint; /** * RESTful endpoint for managing a cluster. @@ -119,7 +118,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterStatusEntity.class) @ApiOperation( value = "Gets the status of the cluster", response = ClusterStatusEntity.class, @@ -191,7 +189,6 @@ public class ClusterResource extends ApplicationResource { @Consumes(MediaType.WILDCARD) @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterEntity.class) @ApiOperation( value = "Gets the contents of the cluster", notes = "Returns the contents of the cluster including all nodes and their status.", @@ -248,7 +245,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/search-results") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterSearchResultsEntity.class) @ApiOperation( value = "Searches the cluster for a node with the specified address", response = ClusterSearchResultsEntity.class, @@ -323,7 +319,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/processors/{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessorEntity.class) @ApiOperation( value = "Gets the specified processor", response = ProcessorEntity.class, @@ -389,7 +384,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/processors/{id}") @PreAuthorize("hasAnyRole('ROLE_DFM')") - @TypeHint(ProcessorEntity.class) public Response updateProcessor( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -440,7 +434,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/processors/{id}") @PreAuthorize("hasAnyRole('ROLE_DFM')") - @TypeHint(ProcessorEntity.class) @ApiOperation( value = "Updates processor annotation data", response = ProcessorEntity.class, @@ -538,7 +531,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/processors/{id}/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterProcessorStatusEntity.class) @ApiOperation( value = "Gets the processor status across the cluster", response = ClusterProcessorStatusEntity.class, @@ -601,7 +593,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/processors/{id}/status/history") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterStatusHistoryEntity.class) @ApiOperation( value = "Gets processor status history across the cluster", response = ClusterStatusHistoryEntity.class, @@ -663,7 +654,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/connections/{id}/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterConnectionStatusEntity.class) @ApiOperation( value = "Gets connection status across the cluster", response = ClusterConnectionStatusEntity.class, @@ -726,7 +716,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/connections/{id}/status/history") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterStatusHistoryEntity.class) @ApiOperation( value = "Gets connection status history across the cluster", response = ClusterStatusHistoryEntity.class, @@ -788,7 +777,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/process-groups/{id}/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterProcessGroupStatusEntity.class) @ApiOperation( value = "Gets process group status across the cluster", response = ClusterProcessGroupStatusEntity.class, @@ -851,7 +839,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/process-groups/{id}/status/history") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterStatusHistoryEntity.class) @ApiOperation( value = "Gets process group status history across the cluster", response = ClusterStatusHistoryEntity.class, @@ -913,7 +900,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/remote-process-groups/{id}/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterRemoteProcessGroupStatusEntity.class) @ApiOperation( value = "Gets remote process group status across the cluster", response = ClusterRemoteProcessGroupStatusEntity.class, @@ -976,7 +962,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/input-ports/{id}/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterPortStatusEntity.class) @ApiOperation( value = "Gets input port status across the cluster", response = ClusterPortStatusEntity.class, @@ -1039,7 +1024,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/output-ports/{id}/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterPortStatusEntity.class) @ApiOperation( value = "Gets output port status across the cluster", response = ClusterPortStatusEntity.class, @@ -1102,7 +1086,6 @@ public class ClusterResource extends ApplicationResource { @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) @Path("/remote-process-groups/{id}/status/history") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ClusterStatusHistoryEntity.class) @ApiOperation( value = "Gets the remote process group status history across the cluster", response = ClusterStatusHistoryEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java index 5dfc8ad..93fde8f 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java @@ -71,7 +71,6 @@ import org.apache.nifi.web.api.request.IntegerParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -122,7 +121,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ConnectionsEntity.class) @ApiOperation( value = "Gets all connections", response = ConnectionsEntity.class, @@ -181,7 +179,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ConnectionEntity.class) @ApiOperation( value = "Gets a connection", response = ConnectionEntity.class, @@ -245,7 +242,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/status/history") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(StatusHistoryEntity.class) @ApiOperation( value = "Gets the status history for a connection", response = StatusHistoryEntity.class, @@ -325,7 +321,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ConnectionEntity.class) public Response createConnection( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -460,7 +455,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ConnectionEntity.class) @ApiOperation( value = "Creates a connection", response = ConnectionEntity.class, @@ -585,7 +579,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ConnectionEntity.class) public Response updateConnection( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -723,7 +716,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ConnectionEntity.class) @ApiOperation( value = "Updates a connection", response = ConnectionEntity.class, @@ -818,7 +810,6 @@ public class ConnectionResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ConnectionEntity.class) @ApiOperation( value = "Deletes a connection", response = ConnectionEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java index 8ecae5d..82d66f9 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java @@ -80,7 +80,6 @@ import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; import org.apache.nifi.web.api.entity.ControllerServiceTypesEntity; import org.apache.nifi.web.api.entity.ReportingTaskTypesEntity; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.springframework.security.access.prepost.PreAuthorize; /** @@ -273,7 +272,6 @@ public class ControllerResource extends ApplicationResource { @Consumes(MediaType.WILDCARD) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @PreAuthorize("hasRole('ROLE_NIFI')") - @TypeHint(ControllerEntity.class) @ApiOperation( value = "Returns the details about this NiFi necessary to communicate via site to site", response = ControllerEntity.class, @@ -325,7 +323,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/search-results") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(SearchResultsEntity.class) @ApiOperation( value = "Performs a search against this NiFi using the specified search term", response = SearchResultsEntity.class, @@ -376,7 +373,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/archive") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) @ApiOperation( value = "Creates a new archive of this NiFi flow configuration", notes = "This POST operation returns a URI that is not representative of the thing " @@ -454,7 +450,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/revision") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(Entity.class) @ApiOperation( value = "Gets the current revision of this NiFi", response = Entity.class, @@ -495,7 +490,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ControllerStatusEntity.class) @ApiOperation( value = "Gets the current status of this NiFi", response = Entity.class, @@ -546,7 +540,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/counters") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(CountersEntity.class) @ApiOperation( value = "Gets the current counters for this NiFi", response = Entity.class, @@ -599,7 +592,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/counters/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(CounterEntity.class) @ApiOperation( value = "Updates the specified counter. This will reset the counter value to 0", response = CounterEntity.class, @@ -663,7 +655,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/config") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN', 'ROLE_NIFI')") - @TypeHint(ControllerConfigurationEntity.class) @ApiOperation( value = "Retrieves the configuration for this NiFi", response = ControllerConfigurationEntity.class, @@ -727,7 +718,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/config") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerConfigurationEntity.class) public Response updateControllerConfig( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -779,7 +769,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/config") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerConfigurationEntity.class) @ApiOperation( value = "Retrieves the configuration for this NiFi", response = ControllerConfigurationEntity.class, @@ -857,7 +846,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/authorities") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(AuthorityEntity.class) @ApiOperation( value = "Retrieves the user details, including the authorities, about the user making the request", response = AuthorityEntity.class, @@ -913,7 +901,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/banners") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(BannerEntity.class) @ApiOperation( value = "Retrieves the banners for this NiFi", response = BannerEntity.class, @@ -974,7 +961,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/processor-types") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessorTypesEntity.class) @ApiOperation( value = "Retrieves the types of processors that this NiFi supports", response = ProcessorTypesEntity.class, @@ -1029,7 +1015,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/controller-service-types") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ControllerServiceTypesEntity.class) @ApiOperation( value = "Retrieves the types of controller services that this NiFi supports", response = ControllerServiceTypesEntity.class, @@ -1088,7 +1073,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/reporting-task-types") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ReportingTaskTypesEntity.class) @ApiOperation( value = "Retrieves the types of reporting tasks that this NiFi supports", response = ReportingTaskTypesEntity.class, @@ -1142,7 +1126,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/prioritizers") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(PrioritizerTypesEntity.class) @ApiOperation( value = "Retrieves the types of prioritizers that this NiFi supports", response = PrioritizerTypesEntity.class, @@ -1196,7 +1179,6 @@ public class ControllerResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/about") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(AboutEntity.class) @ApiOperation( value = "Retrieves details about this NiFi to put in the About dialog", response = AboutEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java index 5ed57d2..2a68015 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java @@ -72,7 +72,6 @@ import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentsEnti import org.apache.nifi.web.api.entity.ControllerServicesEntity; import org.apache.nifi.web.api.entity.PropertyDescriptorEntity; import org.apache.nifi.web.util.Availability; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -166,7 +165,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ControllerServicesEntity.class) @ApiOperation( value = "Gets all controller services", response = ControllerServicesEntity.class, @@ -240,7 +238,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerServiceEntity.class) public Response createControllerService( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -282,7 +279,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerServiceEntity.class) @ApiOperation( value = "Creates a new controller service", response = ControllerServiceEntity.class, @@ -398,7 +394,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ControllerServiceEntity.class) @ApiOperation( value = "Gets a controller service", response = ControllerServiceEntity.class, @@ -473,7 +468,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}/descriptors") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(PropertyDescriptorEntity.class) @ApiOperation( value = "Gets a controller service property descriptor", response = PropertyDescriptorEntity.class, @@ -560,7 +554,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}/references") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ControllerServiceEntity.class) @ApiOperation( value = "Gets a controller service", response = ControllerServiceEntity.class, @@ -643,7 +636,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}/references") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerServiceEntity.class) @ApiOperation( value = "Updates a controller services references", response = ControllerServiceEntity.class, @@ -799,7 +791,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerServiceEntity.class) public Response updateControllerService( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -878,7 +869,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerServiceEntity.class) @ApiOperation( value = "Updates a controller service", response = ControllerServiceEntity.class, @@ -988,7 +978,6 @@ public class ControllerServiceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ControllerServiceEntity.class) @ApiOperation( value = "Deletes a controller service", response = ControllerServiceEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java index 382741b..d0ad806 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FunnelResource.java @@ -59,7 +59,6 @@ import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -112,7 +111,6 @@ public class FunnelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(FunnelsEntity.class) @ApiOperation( value = "Gets all funnels", response = FunnelsEntity.class, @@ -177,7 +175,6 @@ public class FunnelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(FunnelEntity.class) public Response createFunnel( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -221,7 +218,6 @@ public class FunnelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(FunnelEntity.class) @ApiOperation( value = "Creates a funnel", response = FunnelEntity.class, @@ -323,7 +319,6 @@ public class FunnelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(FunnelEntity.class) @ApiOperation( value = "Gets a funnel", response = FunnelEntity.class, @@ -394,7 +389,6 @@ public class FunnelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(FunnelEntity.class) public Response updateFunnel( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -442,7 +436,6 @@ public class FunnelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(FunnelEntity.class) @ApiOperation( value = "Updates a funnel", response = FunnelEntity.class, @@ -541,7 +534,6 @@ public class FunnelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(FunnelEntity.class) @ApiOperation( value = "Deletes a funnel", response = FunnelEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java index 5be739e..7462ff8 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/HistoryResource.java @@ -45,7 +45,6 @@ import org.apache.nifi.web.api.dto.action.ActionDTO; import org.apache.nifi.web.api.dto.action.HistoryDTO; import org.apache.nifi.web.api.dto.action.HistoryQueryDTO; import org.apache.nifi.web.api.entity.ComponentHistoryEntity; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.springframework.security.access.prepost.PreAuthorize; /** @@ -89,7 +88,6 @@ public class HistoryResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(HistoryEntity.class) @ApiOperation( value = "Gets configuration history", response = HistoryEntity.class, @@ -239,7 +237,6 @@ public class HistoryResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") @Path("{id}") - @TypeHint(ActionEntity.class) @ApiOperation( value = "Gets an action", response = ActionEntity.class, @@ -305,7 +302,6 @@ public class HistoryResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_ADMIN')") - @TypeHint(HistoryEntity.class) @ApiOperation( value = "Purges history", response = HistoryEntity.class, @@ -367,7 +363,6 @@ public class HistoryResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/processors/{processorId}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ComponentHistoryEntity.class) @ApiOperation( value = "Gets configuration history for a processor", response = ComponentHistoryEntity.class, @@ -425,7 +420,6 @@ public class HistoryResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/controller-services/{controllerServiceId}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ComponentHistoryEntity.class) @ApiOperation( value = "Gets configuration history for a controller service", response = ComponentHistoryEntity.class, @@ -483,7 +477,6 @@ public class HistoryResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/reporting-tasks/{reportingTaskId}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ComponentHistoryEntity.class) @ApiOperation( value = "Gets configuration history for a reporting task", response = ComponentHistoryEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java index 8cdf5ce..b4c4607 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/InputPortResource.java @@ -61,7 +61,6 @@ import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.IntegerParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -112,7 +111,6 @@ public class InputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(InputPortsEntity.class) @ApiOperation( value = "Gets all input ports", response = InputPortsEntity.class, @@ -175,7 +173,6 @@ public class InputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(InputPortEntity.class) public Response createInputPort( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -222,7 +219,6 @@ public class InputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(InputPortEntity.class) @ApiOperation( value = "Creates an input port", response = InputPortEntity.class, @@ -323,7 +319,6 @@ public class InputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(InputPortEntity.class) @ApiOperation( value = "Gets an input port", response = InputPortEntity.class, @@ -397,7 +392,6 @@ public class InputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(InputPortEntity.class) public Response updateInputPort( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -468,7 +462,6 @@ public class InputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(InputPortEntity.class) @ApiOperation( value = "Updates an input port", response = InputPortEntity.class, @@ -565,7 +558,6 @@ public class InputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(InputPortEntity.class) @ApiOperation( value = "Deletes an input port", response = InputPortEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java index 708b312..b6edb71 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/LabelResource.java @@ -61,7 +61,6 @@ import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -112,7 +111,6 @@ public class LabelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(LabelsEntity.class) @ApiOperation( value = "Gets all labels", response = LabelsEntity.class, @@ -177,7 +175,6 @@ public class LabelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(LabelEntity.class) public Response createLabel( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -232,7 +229,6 @@ public class LabelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(LabelEntity.class) @ApiOperation( value = "Creates a label", response = LabelEntity.class, @@ -332,7 +328,6 @@ public class LabelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(LabelEntity.class) @ApiOperation( value = "Gets a label", response = LabelEntity.class, @@ -408,7 +403,6 @@ public class LabelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(LabelEntity.class) public Response updateLabel( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -486,7 +480,6 @@ public class LabelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(LabelEntity.class) @ApiOperation( value = "Updates a label", response = LabelEntity.class, @@ -582,7 +575,6 @@ public class LabelResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(LabelEntity.class) @ApiOperation( value = "Deletes a label", response = LabelEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java index a867ffc..60c858a 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/NodeResource.java @@ -46,7 +46,6 @@ import org.apache.nifi.web.api.dto.RevisionDTO; import org.apache.nifi.web.api.dto.status.NodeStatusDTO; import org.apache.nifi.web.api.entity.ProcessGroupStatusEntity; import org.apache.nifi.web.api.entity.SystemDiagnosticsEntity; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.springframework.security.access.prepost.PreAuthorize; /** @@ -70,7 +69,6 @@ public class NodeResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(NodeEntity.class) @ApiOperation( value = "Gets a node in the cluster", response = NodeEntity.class, @@ -135,7 +133,6 @@ public class NodeResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessGroupStatusEntity.class) @ApiOperation( value = "Gets process group status for a node in the cluster", response = ProcessGroupStatusEntity.class, @@ -198,7 +195,6 @@ public class NodeResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/system-diagnostics") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(SystemDiagnosticsEntity.class) @ApiOperation( value = "Gets system diagnostics for a node in the cluester", response = SystemDiagnosticsEntity.class, @@ -263,7 +259,6 @@ public class NodeResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasAnyRole('ROLE_ADMIN')") - @TypeHint(NodeEntity.class) public Response updateNode(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id, @FormParam("status") String status, @@ -300,7 +295,6 @@ public class NodeResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasAnyRole('ROLE_ADMIN')") - @TypeHint(NodeEntity.class) @ApiOperation( value = "Updates a node in the cluster", response = NodeEntity.class, @@ -377,7 +371,6 @@ public class NodeResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasAnyRole('ROLE_ADMIN')") - @TypeHint(NodeEntity.class) @ApiOperation( value = "Removes a node from the cluster", response = NodeEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java index 3369657..127ac43 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/OutputPortResource.java @@ -61,7 +61,6 @@ import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.IntegerParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -112,7 +111,6 @@ public class OutputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(OutputPortsEntity.class) @ApiOperation( value = "Gets all output ports", response = OutputPortsEntity.class, @@ -175,7 +173,6 @@ public class OutputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(OutputPortEntity.class) public Response createOutputPort( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -222,7 +219,6 @@ public class OutputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(OutputPortEntity.class) @ApiOperation( value = "Creates an output port", response = OutputPortEntity.class, @@ -323,7 +319,6 @@ public class OutputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(OutputPortEntity.class) @ApiOperation( value = "Gets an output port", response = OutputPortEntity.class, @@ -397,7 +392,6 @@ public class OutputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(OutputPortEntity.class) public Response updateOutputPort( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -469,7 +463,6 @@ public class OutputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(OutputPortEntity.class) @ApiOperation( value = "Updates an output port", response = OutputPortEntity.class, @@ -566,7 +559,6 @@ public class OutputPortResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(OutputPortEntity.class) @ApiOperation( value = "Deletes an output port", response = OutputPortEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java index 250144d..5f5a437 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java @@ -68,7 +68,6 @@ import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.DoubleParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.springframework.security.access.prepost.PreAuthorize; /** @@ -281,7 +280,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessGroupEntity.class) @ApiOperation( value = "Gets a process group", response = ProcessGroupEntity.class, @@ -363,7 +361,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/snippet-instance") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(FlowSnippetEntity.class) @ApiOperation( value = "Copies a snippet", response = FlowSnippetEntity.class, @@ -475,7 +472,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/template-instance") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(FlowSnippetEntity.class) @ApiOperation( value = "Instantiates a template", response = FlowSnippetEntity.class, @@ -582,7 +578,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) public Response updateProcessGroup( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -623,7 +618,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) @ApiOperation( value = "Updates a process group", response = ProcessGroupEntity.class, @@ -716,7 +710,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/process-group-references/{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessGroupEntity.class) @ApiOperation( value = "Gets a process group", response = ProcessGroupEntity.class, @@ -799,7 +792,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/process-group-references") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessGroupsEntity.class) @ApiOperation( value = "Gets all process groups", response = ProcessGroupsEntity.class, @@ -873,7 +865,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/process-group-references") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) public Response createProcessGroupReference( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -919,7 +910,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/process-group-references") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) @ApiOperation( value = "Creates a process group", response = ProcessGroupEntity.class, @@ -1027,7 +1017,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/process-group-references/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) public Response updateProcessGroupReference( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -1081,7 +1070,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/process-group-references/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) @ApiOperation( value = "Updates a process group", response = ProcessGroupEntity.class, @@ -1177,7 +1165,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/process-group-references/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessGroupEntity.class) @ApiOperation( value = "Deletes a process group", response = ProcessGroupEntity.class, @@ -1258,7 +1245,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/status") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN', 'ROLE_NIFI')") - @TypeHint(ProcessGroupStatusEntity.class) @ApiOperation( value = "Gets the status for a process group", response = ProcessGroupStatusEntity.class, @@ -1321,7 +1307,6 @@ public class ProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/status/history") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(StatusHistoryEntity.class) @ApiOperation( value = "Gets status history for a remote process group", response = StatusHistoryEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java index 67aad17..f972c07 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessorResource.java @@ -81,7 +81,6 @@ import org.apache.nifi.ui.extension.UiExtensionMapping; import org.apache.nifi.web.UiExtensionType; import org.apache.nifi.web.api.dto.PropertyDescriptorDTO; import org.apache.nifi.web.api.entity.PropertyDescriptorEntity; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -159,7 +158,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessorsEntity.class) @ApiOperation( value = "Gets all processors", response = ProcessorsEntity.class, @@ -218,7 +216,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessorEntity.class) public Response createProcessor( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -266,7 +263,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessorEntity.class) @ApiOperation( value = "Creates a new processor", response = ProcessorEntity.class, @@ -373,7 +369,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ProcessorEntity.class) @ApiOperation( value = "Gets a processor", response = ProcessorEntity.class, @@ -437,7 +432,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/status/history") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(StatusHistoryEntity.class) @ApiOperation( value = "Gets status history for a processor", response = StatusHistoryEntity.class, @@ -502,7 +496,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/descriptors") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(PropertyDescriptorEntity.class) @ApiOperation( value = "Gets the descriptor for a processor property", response = PropertyDescriptorEntity.class, @@ -605,7 +598,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessorEntity.class) public Response updateProcessor( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -731,7 +723,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessorEntity.class) @ApiOperation( value = "Updates a processor", response = ProcessorEntity.class, @@ -838,7 +829,6 @@ public class ProcessorResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ProcessorEntity.class) @ApiOperation( value = "Deletes a processor", response = ProcessorEntity.class, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java ---------------------------------------------------------------------- diff --git a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java index 012a1d3..e60e930 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProvenanceResource.java @@ -83,7 +83,6 @@ import org.apache.nifi.web.api.request.LongParameter; import org.apache.nifi.web.DownloadableContent; import org.apache.commons.lang3.StringUtils; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -128,7 +127,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/search-options") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(ProvenanceOptionsEntity.class) @ApiOperation( value = "Gets the searchable attributes for provenance events", response = ProvenanceOptionsEntity.class, @@ -186,7 +184,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/replays") @PreAuthorize("hasRole('ROLE_PROVENANCE') and hasRole('ROLE_DFM')") - @TypeHint(ProvenanceEventEntity.class) @ApiOperation( value = "Replays content from a provenance event", response = ProvenanceEventEntity.class, @@ -492,7 +489,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(ProvenanceEntity.class) public Response submitProvenanceRequest( @Context HttpServletRequest httpServletRequest, @FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @@ -574,7 +570,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(ProvenanceEntity.class) @ApiOperation( value = "Submits a provenance query", response = ProvenanceEntity.class, @@ -687,7 +682,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(ProvenanceEntity.class) @ApiOperation( value = "Gets a provenance query", response = ProvenanceEntity.class, @@ -774,7 +768,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(ProvenanceEntity.class) @ApiOperation( value = "Deletes a provenance query", response = ProvenanceEntity.class, @@ -864,7 +857,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/events/{id}") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(ProvenanceEventEntity.class) @ApiOperation( value = "Gets a provenance event", response = ProvenanceEventEntity.class, @@ -964,7 +956,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/lineage") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(LineageEntity.class) public Response submitLineageRequest( @Context HttpServletRequest httpServletRequest, @FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @@ -1026,7 +1017,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/lineage") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(LineageEntity.class) @ApiOperation( value = "Submits a lineage query", response = LineageEntity.class, @@ -1145,7 +1135,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/lineage/{id}") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(LineageEntity.class) @ApiOperation( value = "Gets a lineage query", response = LineageEntity.class, @@ -1230,7 +1219,6 @@ public class ProvenanceResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/lineage/{id}") @PreAuthorize("hasRole('ROLE_PROVENANCE')") - @TypeHint(LineageEntity.class) @ApiOperation( value = "Deletes a lineage query", response = LineageEntity.class,
