Repository: incubator-nifi Updated Branches: refs/heads/NIFI-292 2783a058a -> 45e3c945b
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/RemoteProcessGroupResource.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/RemoteProcessGroupResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java index 4a040b5..2a12ceb 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/RemoteProcessGroupResource.java @@ -68,7 +68,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.apache.nifi.web.api.entity.ConnectionsEntity; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.prepost.PreAuthorize; @@ -126,7 +125,6 @@ public class RemoteProcessGroupResource 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(RemoteProcessGroupsEntity.class) @ApiOperation( value = "Gets all remote process groups", response = ConnectionsEntity.class, @@ -198,7 +196,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(RemoteProcessGroupEntity.class) @ApiOperation( value = "Gets a remote process group", response = RemoteProcessGroupEntity.class, @@ -271,7 +268,6 @@ public class RemoteProcessGroupResource 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", response = StatusHistoryEntity.class, @@ -339,7 +335,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupEntity.class) public Response createRemoteProcessGroup( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -386,7 +381,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupEntity.class) @ApiOperation( value = "Creates a new process group", response = RemoteProcessGroupEntity.class, @@ -523,7 +517,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupEntity.class) @ApiOperation( value = "Deletes a remote process group", response = RemoteProcessGroupEntity.class, @@ -610,7 +603,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/input-ports/{port-id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupPortEntity.class) public Response updateRemoteProcessGroupInputPort( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -662,7 +654,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/input-ports/{port-id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupPortEntity.class) @ApiOperation( value = "Updates a remote port", response = RemoteProcessGroupPortEntity.class, @@ -756,7 +747,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/output-ports/{port-id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupPortEntity.class) public Response updateRemoteProcessGroupOutputPort( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -808,7 +798,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}/output-ports/{port-id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupPortEntity.class) @ApiOperation( value = "Updates a remote port", response = RemoteProcessGroupPortEntity.class, @@ -903,7 +892,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupEntity.class) public Response updateRemoteProcessGroup( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -957,7 +945,6 @@ public class RemoteProcessGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(RemoteProcessGroupEntity.class) @ApiOperation( value = "Updates a remote process group", response = RemoteProcessGroupEntity.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/ReportingTaskResource.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/ReportingTaskResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java index 67a5809..4af8783 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java @@ -68,7 +68,6 @@ import org.apache.nifi.web.api.entity.PropertyDescriptorEntity; import org.apache.nifi.web.api.entity.ReportingTaskEntity; import org.apache.nifi.web.api.entity.ReportingTasksEntity; 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; @@ -159,7 +158,6 @@ public class ReportingTaskResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ReportingTasksEntity.class) @ApiOperation( value = "Gets all reporting tasks", response = ReportingTasksEntity.class, @@ -233,7 +231,6 @@ public class ReportingTaskResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ReportingTaskEntity.class) public Response createReportingTask( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -275,7 +272,6 @@ public class ReportingTaskResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ReportingTaskEntity.class) @ApiOperation( value = "Creates a new remote process group", response = ReportingTaskEntity.class, @@ -391,7 +387,6 @@ public class ReportingTaskResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(ReportingTaskEntity.class) @ApiOperation( value = "Gets a reporting task", response = ReportingTaskEntity.class, @@ -466,7 +461,6 @@ public class ReportingTaskResource 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 reporting task property descriptor", response = PropertyDescriptorEntity.class, @@ -578,7 +572,6 @@ public class ReportingTaskResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ReportingTaskEntity.class) public Response updateReportingTask( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -660,7 +653,6 @@ public class ReportingTaskResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ReportingTaskEntity.class) @ApiOperation( value = "Updates a reporting task", response = ReportingTaskEntity.class, @@ -770,7 +762,6 @@ public class ReportingTaskResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{availability}/{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(ReportingTaskEntity.class) @ApiOperation( value = "Deletes a reporting task", response = ReportingTaskEntity.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/SnippetResource.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/SnippetResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java index c6b84d9..4dfa9fe 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SnippetResource.java @@ -60,7 +60,6 @@ import org.apache.nifi.web.api.request.ClientIdParameter; import org.apache.nifi.web.api.request.LongParameter; import org.apache.commons.lang3.StringUtils; 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; @@ -225,7 +224,6 @@ public class SnippetResource extends ApplicationResource { @Consumes(MediaType.APPLICATION_FORM_URLENCODED) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(SnippetEntity.class) public Response createSnippet( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -283,7 +281,6 @@ public class SnippetResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(SnippetEntity.class) @ApiOperation( value = "Gets a reporting task property descriptor", response = PropertyDescriptorEntity.class, @@ -398,7 +395,6 @@ public class SnippetResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(SnippetEntity.class) @ApiOperation( value = "Gets a snippet", response = SnippetEntity.class, @@ -483,7 +479,6 @@ public class SnippetResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(SnippetEntity.class) public Response updateSnippet( @Context HttpServletRequest httpServletRequest, @FormParam(VERSION) LongParameter version, @@ -530,7 +525,6 @@ public class SnippetResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(SnippetEntity.class) @ApiOperation( value = "Updates a snippet", response = SnippetEntity.class, @@ -633,7 +627,6 @@ public class SnippetResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(SnippetEntity.class) @ApiOperation( value = "Deletes a snippet", response = SnippetEntity.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/SystemDiagnosticsResource.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/SystemDiagnosticsResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java index 94127bc..fc7636c 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/SystemDiagnosticsResource.java @@ -38,7 +38,6 @@ import org.apache.nifi.web.api.entity.SystemDiagnosticsEntity; import org.apache.nifi.web.api.request.ClientIdParameter; 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; @@ -70,7 +69,6 @@ public class SystemDiagnosticsResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // due to a bug in swagger @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(SystemDiagnosticsEntity.class) @ApiOperation( value = "Gets the diagnostics for the system NiFi is running on", response = SystemDiagnosticsEntity.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/TemplateResource.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/TemplateResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java index 0f6bdc4..7e02198 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/TemplateResource.java @@ -59,7 +59,6 @@ import org.apache.nifi.web.api.entity.TemplateEntity; import org.apache.nifi.web.api.entity.TemplatesEntity; import org.apache.nifi.web.api.request.ClientIdParameter; 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; @@ -111,7 +110,6 @@ public class TemplateResource 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(TemplatesEntity.class) @ApiOperation( value = "Gets all templates", response = TemplatesEntity.class, @@ -175,7 +173,6 @@ public class TemplateResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(TemplateEntity.class) @ApiOperation( value = "Creates a template", response = TemplateEntity.class, @@ -258,7 +255,6 @@ public class TemplateResource extends ApplicationResource { @Produces(MediaType.APPLICATION_XML) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(TemplateEntity.class) public Response importTemplate( @Context HttpServletRequest httpServletRequest, @FormDataParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @@ -321,7 +317,6 @@ public class TemplateResource extends ApplicationResource { @Produces(MediaType.APPLICATION_XML) @Path("") // necessary due to bug in swagger @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(TemplateEntity.class) public Response importTemplate( @Context HttpServletRequest httpServletRequest, TemplateEntity templateEntity) { @@ -383,7 +378,6 @@ public class TemplateResource extends ApplicationResource { @Produces(MediaType.APPLICATION_XML) @Path("{id}") @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(TemplateDTO.class) @ApiOperation( value = "Exports a template", response = TemplateDTO.class, @@ -452,7 +446,6 @@ public class TemplateResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("{id}") @PreAuthorize("hasRole('ROLE_DFM')") - @TypeHint(TemplateEntity.class) @ApiOperation( value = "Deletes a template", response = TemplateEntity.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/UserGroupResource.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/UserGroupResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java index 087dc9d..3a0b596 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserGroupResource.java @@ -50,7 +50,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.nifi.web.NiFiServiceFacade; import org.apache.nifi.web.api.dto.RevisionDTO; import org.apache.nifi.web.api.dto.UserGroupDTO; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.springframework.security.access.prepost.PreAuthorize; /** @@ -94,7 +93,6 @@ public class UserGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{group}") @PreAuthorize("hasRole('ROLE_ADMIN')") - @TypeHint(UserGroupEntity.class) public Response updateUserGroup( @Context HttpServletRequest httpServletRequest, @PathParam("group") String group, @@ -149,7 +147,6 @@ public class UserGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{group}") @PreAuthorize("hasRole('ROLE_ADMIN')") - @TypeHint(UserGroupEntity.class) @ApiOperation( value = "Updates a user group", response = UserGroupEntity.class, @@ -280,7 +277,6 @@ public class UserGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{group}/users/{userId}") @PreAuthorize("hasRole('ROLE_ADMIN')") - @TypeHint(UserGroupEntity.class) @ApiOperation( value = "Removes a user from a user group", notes = "Removes a user from a user group. The will not be deleted, jsut the fact that they were in this group.", @@ -378,7 +374,6 @@ public class UserGroupResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{group}") @PreAuthorize("hasRole('ROLE_ADMIN')") - @TypeHint(UserGroupEntity.class) @ApiOperation( value = "Deletes a user group", notes = "Deletes a user group. The users will not be removed, just the fact that they were grouped.", 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/UserResource.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/UserResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserResource.java index e970516..4a61ef4 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/UserResource.java @@ -62,7 +62,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.nifi.web.NiFiServiceFacade; import static org.apache.nifi.web.api.ApplicationResource.CLIENT_ID; import org.apache.nifi.web.api.dto.RevisionDTO; -import org.codehaus.enunciate.jaxrs.TypeHint; import org.springframework.security.access.prepost.PreAuthorize; /** @@ -98,7 +97,6 @@ public class UserResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("") // necessary due to a bug in swagger @PreAuthorize("hasRole('ROLE_ADMIN')") - @TypeHint(UsersEntity.class) @ApiOperation( value = "Gets all users", response = UsersEntity.class, @@ -157,7 +155,6 @@ public class UserResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @PreAuthorize("hasRole('ROLE_ADMIN')") @Path("/{id}") - @TypeHint(UserEntity.class) @ApiOperation( value = "Gets a user", response = UserEntity.class, @@ -213,7 +210,6 @@ public class UserResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/search-results") @PreAuthorize("hasAnyRole('ROLE_DFM', 'ROLE_ADMIN')") - @TypeHint(UserSearchResultsEntity.class) @ApiOperation( value = "Searches for users", response = UserSearchResultsEntity.class, @@ -334,7 +330,6 @@ public class UserResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @PreAuthorize("hasRole('ROLE_ADMIN')") @Path("/{id}") - @TypeHint(UserEntity.class) public Response updateUser( @Context HttpServletRequest httpServletRequest, @FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @@ -387,7 +382,6 @@ public class UserResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @PreAuthorize("hasRole('ROLE_ADMIN')") @Path("/{id}") - @TypeHint(UserEntity.class) @ApiOperation( value = "Updates a user", response = UserEntity.class, @@ -507,7 +501,6 @@ public class UserResource extends ApplicationResource { @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Path("/{id}") @PreAuthorize("hasRole('ROLE_ADMIN')") - @TypeHint(UserEntity.class) @ApiOperation( value = "Deletes a user", response = UserEntity.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/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/META-INF/NOTICE b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/META-INF/NOTICE deleted file mode 100644 index 253f083..0000000 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,27 +0,0 @@ -nifi-web-api -Copyright 2014-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -=========================================== -Apache Software License v2 -=========================================== - -The following binary components are provided under the Apache Software License v2 - - (ASLv2) Enunciate Core Annotations (org.codehaus.enunciate:enunciate-core-annotations:jar:1.28 - http://dist.codehaus.org/enunciate/enunciate-1.28.zip) - The following NOTICE information applies: - This product includes software developed by the Spring Framework - Project (http://www.springframework.org). - - This product includes software developed by the - Visigoth Software Society (http://www.visigoths.org/). - -======================================================================== -Common Development and Distribution License 1.0 -======================================================================== - -The following binary components are provided under the Common Development and Distribution License 1.0. See project link for details. - - (CDDL 1.0) SR 250 Common Annotations For The JavaTM Platform (javax.annotation:jsr250-api:jar:1.0 - http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html) 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/resources/templates/index.html.hbs ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs index 7bd6e71..de9ed3c 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs @@ -195,7 +195,7 @@ } div.type-container { - overflow-y: scroll; + overflow-y: auto; height: 415px; border-bottom: 1px solid #ccc; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/45e3c945/nifi/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/pom.xml b/nifi/pom.xml index 350e94d..801ddbe 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -124,7 +124,12 @@ <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> <version>3.5.2</version> - </dependency> + </dependency> + <dependency> + <groupId>com.wordnik</groupId> + <artifactId>swagger-annotations</artifactId> + <version>1.5.3-M1</version> + </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId>
