You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/05/18 02:12:38 UTC
[01/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Repository: incubator-nifi
Updated Branches:
refs/heads/master 171dae3c8 -> fdc801bc1
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 f7b2009..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -44,12 +50,12 @@ 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;
/**
* RESTful endpoint for managing this Controller's user groups.
*/
+@Api(hidden = true)
public class UserGroupResource extends ApplicationResource {
/*
@@ -69,11 +75,15 @@ public class UserGroupResource extends ApplicationResource {
* Updates a new user group.
*
* @param httpServletRequest request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param userIds A collection of user ids to include in this group. If a user already belongs to another group, they will be placed in this group instead. Existing users in this group will remain
- * in this group.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param userIds A collection of user ids to include in this group. If a
+ * user already belongs to another group, they will be placed in this group
+ * instead. Existing users in this group will remain in this group.
* @param group The name of the group.
- * @param rawAuthorities Array of authorities to assign to the specified user.
+ * @param rawAuthorities Array of authorities to assign to the specified
+ * user.
* @param status The status of the specified users account.
* @param formParams form params
* @return A userGroupEntity.
@@ -83,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,
@@ -138,10 +147,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateUserGroup(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The name of the user group.",
+ required = true
+ )
@PathParam("group") String group,
+ @ApiParam(
+ value = "The user group configuration details.",
+ required = true
+ )
UserGroupEntity userGroupEntity) {
if (userGroupEntity == null || userGroupEntity.getUserGroup() == null) {
@@ -229,23 +261,55 @@ public class UserGroupResource extends ApplicationResource {
}
/**
- * Deletes the user from the specified group. The user will not be removed, just the fact that they were in this group.
+ * Deletes the user from the specified group. The user will not be removed,
+ * just the fact that they were in this group.
*
* @param httpServletRequest request
* @param group The user group.
* @param userId The user id to remove.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @return A userGroupEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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.",
+ response = UserGroupEntity.class,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeUserFromGroup(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The name of the user group.",
+ required = true
+ )
@PathParam("group") String group,
+ @ApiParam(
+ value = "The id of the user to remove from the user group.",
+ required = true
+ )
@PathParam("userId") String userId,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// this user is being modified, replicate to the nodes to invalidate this account
@@ -295,21 +359,49 @@ public class UserGroupResource extends ApplicationResource {
}
/**
- * Deletes the user group. The users will not be removed, just the fact that they were grouped.
+ * Deletes the user group. The users will not be removed, just the fact that
+ * they were grouped.
*
* @param httpServletRequest request
* @param group The user group.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @return A userGroupEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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.",
+ response = UserGroupEntity.class,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response ungroup(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The name of the user group.",
+ required = true
+ )
@PathParam("group") String group,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// this user is being modified, replicate to the nodes to invalidate this account
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 6dbb1a7..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -56,12 +62,12 @@ 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;
/**
* RESTful endpoint for managing this Controller's users.
*/
+@Api(hidden = true)
public class UserResource extends ApplicationResource {
/*
@@ -80,16 +86,42 @@ public class UserResource extends ApplicationResource {
/**
* Gets all users that are registered within this Controller.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param grouped Whether to return the users in their groups.
* @return A usersEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getUsers(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether to return the users in their respective groups.",
+ required = false
+ )
@QueryParam("grouped") @DefaultValue("false") Boolean grouped) {
// get the users
@@ -112,16 +144,43 @@ public class UserResource extends ApplicationResource {
/**
* Gets the details for the specified user.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The user id.
* @return A userEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@PreAuthorize("hasRole('ROLE_ADMIN')")
@Path("/{id}")
- @TypeHint(UserEntity.class)
- public Response getUser(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiOperation(
+ value = "Gets a user",
+ response = UserEntity.class,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getUser(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The user id.",
+ required = true
+ )
@PathParam("id") String id) {
// get the specified user
@@ -147,11 +206,33 @@ public class UserResource extends ApplicationResource {
* @return A userSearchResultsEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/search-results")
@PreAuthorize("hasAnyRole('ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(UserSearchResultsEntity.class)
- public Response searchUsers(@QueryParam("q") @DefaultValue(StringUtils.EMPTY) String value) {
+ @ApiOperation(
+ value = "Searches for users",
+ response = UserSearchResultsEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response searchUsers(
+ @ApiParam(
+ value = "The search terms.",
+ required = true
+ )
+ @QueryParam("q") @DefaultValue(StringUtils.EMPTY) String value) {
+
final List<UserSearchResultDTO> userMatches = new ArrayList<>();
final List<UserGroupSearchResultDTO> userGroupMatches = new ArrayList<>();
@@ -234,9 +315,12 @@ public class UserResource extends ApplicationResource {
* Updates the specified user.
*
* @param httpServletRequest request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the user to update.
- * @param rawAuthorities Array of authorities to assign to the specified user.
+ * @param rawAuthorities Array of authorities to assign to the specified
+ * user.
* @param status The status of the specified users account.
* @param formParams form params
* @return A userEntity
@@ -246,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,
@@ -299,11 +382,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateUser(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The user id.",
+ required = true
+ )
@PathParam("id") String id,
- UserEntity userEntity) {
+ @ApiParam(
+ value = "The user configuration details.",
+ required = true
+ ) UserEntity userEntity) {
if (userEntity == null || userEntity.getUser() == null) {
throw new IllegalArgumentException("User details must be specified.");
@@ -386,17 +491,43 @@ public class UserResource extends ApplicationResource {
*
* @param httpServletRequest request
* @param id The user id
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @return A userEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}")
@PreAuthorize("hasRole('ROLE_ADMIN')")
- @TypeHint(UserEntity.class)
+ @ApiOperation(
+ value = "Deletes a user",
+ response = UserEntity.class,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response deleteUser(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The user id.",
+ required = true
+ )
@PathParam("id") String id,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// this user is being modified, replicate to the nodes to invalidate this account
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/package-info.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/package-info.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/package-info.java
deleted file mode 100644
index 0392ca4..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/package-info.java
+++ /dev/null
@@ -1,43 +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.
- */
-/**
- * <p>
- * The NiFi REST API allows clients to obtain and update configuration and status information pertaining to an instance of NiFi. The links below detail each resource. Follow the link to get more
- * information about the resource including the supported HTTP methods and the expected parameters.</p>
- *
- * <p>
- * Additionally, the documentation for each resource will describe what type of data should be returned from a successful invocation. However, if the request is not successful one of the follow status
- * codes should be returned:</p>
- *
- * <ul>
- * <li>400 (Bad Request) - A 400 status code will be returned when NiFi is unable to complete the request because it was invalid. The request should not be retried without modification.</li>
- * <li>401 (Unathorized) - A 401 status code indicates that the user is not known to this NiFi instance. The user may submit an account request.</li>
- * <li>403 (Forbidden) - A 403 status code indicates that the user is known to this NiFi instance and they do not have authority to perform the requested action.</li>
- * <li>404 (Not Found) - A 404 status code will be returned when the desired resource does not exist.</li>
- * <li>409 (Conflict) - NiFi employs an optimistic locking strategy where the client must include a revision in their request when performing an update. If the specified revision does not match the
- * current base revision a 409 status code is returned. Additionally, a 409 is used when the state of the system does not allow for the request at that time. This same request may be successful later
- * if the system is in a different state (e.g. cannot delete a processor because it is currently running).</li>
- * <li>500 (Internal Server Error) - A 500 status code indicates that an unexpected error has occurred.</li>
- * </ul>
- *
- * <p>
- * Most unsuccessful requests will include a description of the problem in the entity body of the response.</p>
- *
- * <p>
- * The context path for the REST API is /nifi-api</p>
- */
-package org.apache.nifi.web.api;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/bgNifiLogo.png
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/bgNifiLogo.png b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/bgNifiLogo.png
new file mode 100644
index 0000000..d92c484
Binary files /dev/null and b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/bgNifiLogo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/nifi16.ico
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/nifi16.ico b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/nifi16.ico
new file mode 100644
index 0000000..2ac3670
Binary files /dev/null and b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/images/nifi16.ico differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/endpoint.hbs
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/endpoint.hbs b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/endpoint.hbs
new file mode 100644
index 0000000..6296862
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/endpoint.hbs
@@ -0,0 +1,61 @@
+{{!--
+ 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.
+--}}
+<div class="endpoints">
+ <span class="path hidden">{{@key}}</span>
+ {{#post}}
+ <div class="endpoint post">
+ <div class="operation-handle">
+ <div class="method">POST</div>
+ <div class="path mono"></div>
+ <div class="summary">{{summary}}</div>
+ <div class="clear"></div>
+ </div>
+ {{> operation}}
+ </div>
+ {{/post}}
+ {{#get}}
+ <div class="endpoint get">
+ <div class="operation-handle">
+ <div class="method">GET</div>
+ <div class="path mono"></div>
+ <div class="summary">{{summary}}</div>
+ <div class="clear"></div>
+ </div>
+ {{> operation}}
+ </div>
+ {{/get}}
+ {{#put}}
+ <div class="endpoint put">
+ <div class="operation-handle">
+ <div class="method">PUT</div>
+ <div class="path mono"></div>
+ <div class="summary">{{summary}}</div>
+ <div class="clear"></div>
+ </div>
+ {{> operation}}
+ </div>
+ {{/put}}
+ {{#delete}}
+ <div class="endpoint delete">
+ <div class="operation-handle">
+ <div class="method">DELETE</div>
+ <div class="path mono"></div>
+ <div class="summary">{{summary}}</div>
+ <div class="clear"></div>
+ </div>
+ {{> operation}}
+ </div>
+ {{/delete}}
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/example.hbs
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/example.hbs b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/example.hbs
new file mode 100644
index 0000000..26a4283
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/example.hbs
@@ -0,0 +1,18 @@
+{{!--
+ 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.
+--}}{{!-- formatting here matters... in whitespace: pre. this is not comprehensive but sufficent for our examples --}}
+{{#each properties}} {{#ifeq type "string"}}"{{@key}}": "value"{{/ifeq}}{{#ifeq type "boolean"}}"{{@key}}": true{{/ifeq}}{{#ifeq type "integer"}}"{{@key}}": 0{{/ifeq}}{{#ifeq type "number"}}"{{@key}}": 0.0{{/ifeq}}{{#if $ref}}"{{@key}}": <span class="nested collapsed"><span class="nested-id hidden">{{basename $ref}}</span><span class="nested-example"><span class="open-object">{…}</span></span></span>{{/if}}{{#ifeq type "array"}}"{{@key}}": [{{#if items.$ref}}<span class="nested collapsed"><span class="nested-id hidden">{{basename items.$ref}}</span><span class="nested-example"><span class="open-object">{…}</span></span></span>{{else}}"value"{{/if}}]{{/ifeq}}{{#ifeq type "object"}}"{{@key}}": <span class="open-object">{
+ "name": {{#if additionalProperties.$ref}}<span class="nested collapsed"><span class="nested-id hidden">{{basename additionalProperties.$ref}}</span><span class="nested-example"><span class="open-object">{…}</span></span></span>{{else}}{{#ifeq additionalProperties.type "integer"}}0{{else}}"value"{{/ifeq}}{{/if}}
+ }</span>{{/ifeq}}<span class="comma">,</span>
+{{/each}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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
new file mode 100644
index 0000000..c44a47f
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs
@@ -0,0 +1,597 @@
+<!DOCTYPE html>
+<!--
+ 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.
+-->
+<html>
+ <head>
+ <title>{{info.title}}-{{info.version}}</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <link rel="shortcut icon" href="images/nifi16.ico"/>
+ <script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script>
+ <script type="text/javascript">
+ if (typeof window.jQuery === 'undefined') {
+ document.write(unescape('%3Cscript src="https://code.jquery.com/jquery-2.1.1.min.js" type="text/javascript" %3E%3C/script%3E'));
+ }
+ </script>
+ <style>
+ @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 {
+ overflow-y: scroll;
+ }
+
+ html, html a {
+ -webkit-font-smoothing: antialiased;
+ text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+ }
+
+ body {
+ width: 62.5em;
+ margin: 0 auto;
+ display: block;
+ font-family: "Open Sans", "DejaVu Sans", sans-serif;
+ }
+
+ div.header {
+ margin-top: 10px;
+ }
+
+ img.logo {
+ float: left;
+ margin-right: 10px;
+ }
+
+ div.header > div.title {
+ font-size: 30px;
+ height: 50px;
+ line-height: 50px;
+ }
+
+ .sub-title {
+ font-style: italic;
+ color: #aaa;
+ }
+
+ div.overview {
+ margin-top: 10px;
+ margin-bottom: 15px;
+ }
+
+ div.endpoint {
+ margin-bottom: 10px;
+ }
+
+ /* get */
+
+ div.endpoint.get {
+ border: 1px solid #174961;
+ }
+
+ div.get div.operation-handle {
+ background-color: rgba(23, 73, 97, .15);
+ }
+
+ div.get div.method {
+ background-color: #174961;
+ }
+
+ div.get div.operation {
+ border-top: 1px solid #174961;
+ }
+
+ /* post */
+
+ div.endpoint.post {
+ border: 1px solid #7298AC;
+ }
+
+ div.post div.operation-handle {
+ background-color: rgba(114, 152, 172, .15);
+ }
+
+ div.post div.method {
+ background-color: #7298AC;
+ }
+
+ div.post div.operation {
+ border-top: 1px solid #7298AC;
+ }
+
+ /* put */
+
+ div.endpoint.put {
+ border: 1px solid #063046;
+ }
+
+ div.put div.operation-handle {
+ background-color: rgba(6, 48, 70, .15);
+ }
+
+ div.put div.method {
+ background-color: #063046;
+ }
+
+ div.put div.operation {
+ border-top: 1px solid #063046;
+ }
+
+ /* delete */
+
+ div.endpoint.delete {
+ border: 1px solid #47758E;
+ }
+
+ div.delete div.operation-handle {
+ background-color: rgba(71, 117, 142, .15);
+ }
+
+ div.delete div.method {
+ background-color: #47758E;
+ }
+
+ div.delete div.operation {
+ border-top: 1px solid #47758E;
+ }
+
+ /* operations */
+
+ div.operation-handle {
+ cursor: pointer;
+ padding-right: 5px;
+ height: 22px;
+ }
+
+ div.method {
+ float: left;
+ width: 75px;
+ color: #fff;
+ text-align: center;
+ background-color: #7098ad;
+ margin-right: 10px;
+ font-weight: bold;
+ }
+
+ div.endpoint div.path {
+ float: left;
+ line-height: 22px;
+ }
+
+ div.summary {
+ float: right;
+ font-size: 12px;
+ line-height: 22px;
+ }
+
+ div.operation {
+ padding: 5px;
+ font-size: 12px;
+ }
+
+ div.operation > div.title {
+ font-weight: bold;
+ color: #000;
+ }
+
+ div.operation > table {
+ margin-left: 5px;
+ margin-right: 5px;
+ }
+
+ div.operation div.details {
+ margin-left: 5px;
+ margin-bottom: 5px;
+ color: #333;
+ }
+
+ div.operation div.description {
+ margin-bottom: 10px;
+ }
+
+ div.mediatype {
+ line-height: 16px;
+ }
+
+ div.mediatype > div.title {
+ float: left;
+ width: 70px;
+ }
+
+ div.mediatype div.title {
+ float: left;
+ }
+
+ div.type {
+ position: fixed;
+ width: 800px;
+ height: 500px;
+ left: 50%;
+ top: 50%;
+ margin-left: -400px;
+ margin-top: -250px;
+ border: 3px solid #365C6A;
+ box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9);
+ padding: 10px;
+ background-color: #eee;
+ font-size: 12px;
+ }
+
+ div.type-container {
+ overflow-y: auto;
+ height: 415px;
+ border-bottom: 1px solid #ccc;
+ }
+
+ div.close {
+ border: 1px solid #aaa;
+ background-color: #ddd;
+ float: right;
+ margin-top: 10px;
+ font-weight: bold;
+ height: 25px;
+ line-height: 25px;
+ padding: 0 10px;
+ cursor: pointer;
+ }
+
+ div.close:hover {
+ background-color: #d1d1d1;
+ }
+
+ div.section-header > div.title {
+ font-size: 24px;
+ float: left;
+ }
+
+ div.section-description {
+ float: right;
+ margin-top: 10px;
+ }
+
+ div.section-endpoints {
+ margin-top: 10px;
+ }
+
+ /* 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 th {
+ font-weight: bold;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px 15px;
+ border-width: 0;
+ white-space: nowrap;
+ }
+
+ table td {
+ vertical-align:top;
+ text-align:left;
+ padding: 2px 15px;
+ border-width: 0;
+ white-space: nowrap;
+ }
+
+ table td:last-child {
+ width: 99%;
+ white-space: normal;
+ }
+
+ code.example {
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
+ color: #555;
+ margin-bottom: 10px;
+ padding: 5px 8px;
+ white-space: pre;
+ display: block;
+ tab-size: 4;
+ -moz-tab-size: 4;
+ -o-tab-size: 4;
+ line-height: 20px
+ }
+
+ span.nested.collapsed {
+ cursor: pointer;
+ border: 1px solid #7298AC;
+ background-color: rgba(114, 152, 172, .15);
+ padding: 1px;
+ }
+
+ /* general */
+
+ .mono {
+ font-family: monospace;
+ }
+
+ div.clear {
+ clear: both;
+ }
+
+ .hidden {
+ display: none;
+ }
+
+ a, .link {
+ cursor: pointer;
+ color: #1e373f;
+ font-weight: normal;
+ }
+
+ a:hover, .link:hover {
+ color: #264c58;
+ text-decoration: underline;
+ }
+ </style>
+ <script type="text/javascript">
+ $(document).ready(function () {
+ // hide any open type dialogs
+ $('html').on('click', function() {
+ $('div.type').hide();
+ }).on('keydown', function(e) {
+ if (e.which === 27) {
+ $('div.type').hide();
+ }
+ });
+
+ // populate all paths - this is necessary because the @key
+ // doesn't seem to reset after iterating through a nested
+ // array or object
+ $('span.path').each(function() {
+ var path = $(this);
+ var endpoint = path.parent();
+ endpoint.find('div.path').text(path.text());
+ });
+
+ // toggles the visibility of a given operation
+ $('div.operation-handle').on('click', function () {
+ $(this).next('div.operation').slideToggle();
+ });
+
+ // add support for clicking to view the definition of a type
+ $('a.type-link').on('click', function(e) {
+ // hide any previously shown dialogs
+ $('div.type').hide();
+
+ // show the type selected
+ var link = $(this);
+ var typeId = link.text();
+ $('#' + typeId).show();
+ e.stopPropagation();
+ });
+
+ // prevent hiding when clicking on the type dialog
+ $('div.type').on('click', function(e) {
+ e.stopPropagation();
+ });
+
+ // due to lack of support for @last when iterating objects in
+ // handlebars we need to remove the last comma from each example
+ $('code.example').find('span.comma:last').remove();
+
+ // populate nested examples
+ $('code.example').on('click', 'span.nested', function(e) {
+ var nested = $(this).removeClass('collapsed');
+ var nestedId = nested.find('span.nested-id');
+ var nestedExample = nested.find('span.nested-example');
+
+ // get the id of the nested example
+ var typeId = nestedId.text();
+ var example = $('#' + typeId + ' code.example').html();
+ var depth = nestedId.parents('span.open-object').length;
+
+ // tab over as appropriate
+ example = example.replace(/(\r\n|\r|\n)/g, function(match) {
+ var tab = '\t';
+ for (var i = 0; i < depth - 1; i++) {
+ tab += '\t';
+ }
+ return match + tab;
+ });
+
+ // copy over the example
+ nestedExample.html(example);
+ e.stopPropagation();
+ });
+
+ // handle close button
+ $('div.close').on('click', function() {
+ $(this).closest('div.type').hide();
+ });
+
+ // function for organizing the endpoints
+ var organizeEndpoints = function(term, container) {
+ $('div.unorganized > div.endpoints').each(function() {
+ var endpoints = $(this);
+ var path = endpoints.find('div.path').text();
+
+ if (term === null || path.indexOf(term) > 0) {
+ endpoints.detach().appendTo(container);
+ }
+ });
+ };
+
+ // organize the endpoints
+ organizeEndpoints('cluster', $('#cluster-endpoints'));
+ organizeEndpoints('provenance', $('#provenance-endpoints'));
+ organizeEndpoints('user', $('#user-endpoints'));
+ organizeEndpoints('controller-services', $('#controller-service-endpoints'));
+ organizeEndpoints('reporting-tasks', $('#reporting-task-endpoints'));
+ organizeEndpoints('connections', $('#connection-endpoints'));
+ organizeEndpoints('processors', $('#processor-endpoints'));
+ organizeEndpoints('funnels', $('#funnel-endpoints'));
+ organizeEndpoints('remote-process-groups', $('#remote-process-group-endpoints'));
+ organizeEndpoints('input-ports', $('#input-port-endpoints'));
+ organizeEndpoints('output-ports', $('#output-port-endpoints'));
+ organizeEndpoints('labels', $('#label-endpoints'));
+ organizeEndpoints('process-groups', $('#process-group-endpoints'));
+ organizeEndpoints('history', $('#history-endpoints'));
+ organizeEndpoints(null, $('#controller-endpoints'));
+
+
+ // handle expanding/collapsing the sections
+ $('div.section-header > div.title').on('click', function() {
+ $(this).parent('div.section-header').next('div.section-endpoints').slideToggle();
+ });
+ });
+ </script>
+ </head>
+ <body>
+ <div class="header">
+ <img class="logo" src="images/bgNifiLogo.png" alt="NiFi Logo"/>
+ <div class="title">{{basePath}}</div>
+ <div class="sub-title">{{info.title}} {{info.version}}</div>
+ <div class="clear"></div>
+ </div>
+ <div class="clear"></div>
+ <div class="overview">{{info.description}}</div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Controller</div>
+ <div class="sub-title section-description">Get controller configuration, Search the flow, Manage templates, System diagnostics</div>
+ <div class="clear"></div>
+ </div>
+ <div id="controller-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Process Groups</div>
+ <div class="sub-title section-description">Get the flow, Instantiate a template, Manage sub groups, Monitor component status</div>
+ <div class="clear"></div>
+ </div>
+ <div id="process-group-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Processors</div>
+ <div class="sub-title section-description">Create a processor, Set properties, Schedule</div>
+ <div class="clear"></div>
+ </div>
+ <div id="processor-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Connections</div>
+ <div class="sub-title section-description">Create a connection, Set queue priority, Update connection destination</div>
+ <div class="clear"></div>
+ </div>
+ <div id="connection-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Input Ports</div>
+ <div class="sub-title section-description">Create an input port, Set remote port access control</div>
+ <div class="clear"></div>
+ </div>
+ <div id="input-port-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Output Ports</div>
+ <div class="sub-title section-description">Create an output port, Set remote port access control</div>
+ <div class="clear"></div>
+ </div>
+ <div id="output-port-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Remote Process Groups</div>
+ <div class="sub-title section-description">Create a remote group, Enable transmission</div>
+ <div class="clear"></div>
+ </div>
+ <div id="remote-process-group-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Labels</div>
+ <div class="sub-title section-description">Create a label, Set label style</div>
+ <div class="clear"></div>
+ </div>
+ <div id="label-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Funnels</div>
+ <div class="sub-title section-description">Manage funnels</div>
+ <div class="clear"></div>
+ </div>
+ <div id="funnel-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Controller Services</div>
+ <div class="sub-title section-description">Manage controller services, Update controller service references</div>
+ <div class="clear"></div>
+ </div>
+ <div id="controller-service-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Reporting Tasks</div>
+ <div class="sub-title section-description">Manage reporting tasks</div>
+ <div class="clear"></div>
+ </div>
+ <div id="reporting-task-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Cluster</div>
+ <div class="sub-title section-description">View node status, Disconnect nodes, Aggregate component status</div>
+ <div class="clear"></div>
+ </div>
+ <div id="cluster-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Provenance</div>
+ <div class="sub-title section-description">Query provenance, Search event lineage, Download content, Replay</div>
+ <div class="clear"></div>
+ </div>
+ <div id="provenance-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">History</div>
+ <div class="sub-title section-description">View flow history, Purge flow history</div>
+ <div class="clear"></div>
+ </div>
+ <div id="history-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="section">
+ <div class="section-header">
+ <div class="title link">Users</div>
+ <div class="sub-title section-description">Update user access, revoke accounts, get account details, Group users</div>
+ <div class="clear"></div>
+ </div>
+ <div id="user-endpoints" class="section-endpoints hidden"></div>
+ </div>
+ <div class="unorganized hidden">
+ {{#each paths}}
+ {{> endpoint}}
+ {{/each}}
+ </div>
+ {{#each definitions}}
+ {{> type}}
+ {{/each}}
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/operation.hbs
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/operation.hbs b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/operation.hbs
new file mode 100644
index 0000000..5fb25e7
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/operation.hbs
@@ -0,0 +1,104 @@
+{{!--
+ 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.
+--}}
+<div class="operation hidden">
+ {{#if description}}
+ <div class="description">
+ {{description}}
+ </div>
+ {{/if}}
+ <div class="title">Request</div>
+ <div class="mediatypes details">
+ {{#if consumes}}
+ <div class="mediatype"><div class="title">consumes:</div><div class="mono">{{join consumes ", "}}</div><div class="clear"></div></div>
+ {{/if}}
+ </div>
+ {{#if parameters}}
+ <table>
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>Location</th>
+ <th>Type</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{/if}}
+ {{#each parameters}}
+ <tr>
+ <td>{{#ifeq in "body"}}{{else}}{{name}}{{/ifeq}}</td>
+ <td>{{in}}</td>
+ {{#ifeq in "body"}}
+ <td>
+ {{#ifeq schema.type "array"}}Array[<a class="type-link" href="javascript:void(0);">{{basename schema.items.$ref}}</a>]{{/ifeq}}
+ {{#schema.$ref}}<a class="type-link" href="javascript:void(0);">{{basename schema.$ref}}</a> {{/schema.$ref}}
+ </td>
+ {{else}}
+ {{#ifeq type "array"}}
+ <td>Array[{{items.type}}] ({{collectionFormat}})</td>
+ {{else}}
+ {{#ifeq type "ref"}}
+ <td>string</td>
+ {{else}}
+ <td>{{type}} {{#format}}({{format}}){{/format}}</td>
+ {{/ifeq}}
+ {{/ifeq}}
+ {{/ifeq}}
+ <td>{{description}}</td>
+ </tr>
+ {{/each}}
+ {{#if parameters}}
+ </tbody>
+ </table>
+ {{/if}}
+ <div class="title">Response</div>
+ <div class="mediatypes details">
+ {{#if produces}}
+ <div class="mediatype"><div class="title">produces:</div><div class="mono">{{join produces ", "}}</div><div class="clear"></div></div>
+ {{/if}}
+ </div>
+ <table>
+ <thead>
+ <tr>
+ <th>Status Code</th>
+ <th>Type</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{#each responses}}
+ <tr>
+ <td>{{@key}}</td>
+ <td>
+ {{#if schema}}
+ {{#schema.$ref}}<a class="type-link" href="javascript:void(0);">{{basename schema.$ref}}</a>{{/schema.$ref}}
+ {{else}}
+ string
+ {{/if}}
+ </td>
+ <td>{{description}}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+ <div class="title">Authorization</div>
+ <div class="authorization details">
+ {{#security}}
+ {{#each this}}
+ <div>{{@key}}</div>
+ {{/each}}
+ {{/security}}
+ </div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/type.hbs
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/type.hbs b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/type.hbs
new file mode 100644
index 0000000..d64610d
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/type.hbs
@@ -0,0 +1,55 @@
+{{!--
+ 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.
+--}}
+<div id="{{@key}}" class="type hidden">
+ <h3>{{@key}}</h3>
+ <div class="type-container">
+ <table>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Required</th>
+ <th>Description</th>
+ </tr>
+ {{#each properties}}
+ <tr>
+ <td>{{@key}}</td>
+ <td>
+ {{#ifeq type "array"}}
+ {{#items.$ref}}
+ {{type}}[<a class="type-link" href="javascript:void(0);">{{basename items.$ref}}</a>]
+ {{/items.$ref}}
+ {{^items.$ref}}
+ {{type}}[{{items.type}}]
+ {{/items.$ref}}
+ {{else}}
+ {{#$ref}}
+ <a class="type-link" href="javascript:void(0);">{{basename $ref}}</a>
+ {{/$ref}}
+ {{^$ref}}
+ {{type}}{{#format}} ({{format}}){{/format}}
+ {{/$ref}}
+ {{/ifeq}}
+ </td>
+ <td>{{#required}}required{{/required}}{{^required}}optional{{/required}}</td>
+ <td>{{#description}}{{{description}}}{{/description}}{{#if enum}} Allowable values: {{join enum ", "}}{{/if}}</td>
+ </tr>
+ {{/each}}
+ </table>
+ <h4>Example JSON</h4>
+ <code class="example"><span class="open-object">{{{> example}}}</span></code>
+ </div>
+ <div class="close">Close</div>
+ <div class="clear"></div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index ec23e83..7444403 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>
[48/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare release
nifi-nar-maven-plugin-1.0.1-incubating-rc13
Posted by ma...@apache.org.
NIFI-429: prepare release nifi-nar-maven-plugin-1.0.1-incubating-rc13
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1fc8453b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1fc8453b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1fc8453b
Branch: refs/heads/master
Commit: 1fc8453b36c1a1d600a911668f10249cf1e52ea7
Parents: 0b8533f
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 14:01:54 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 14:01:54 2015 -0400
----------------------------------------------------------------------
nifi-nar-maven-plugin/pom.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1fc8453b/nifi-nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index accf8e6..443ff9e 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<relativePath />
</parent>
<artifactId>nifi-nar-maven-plugin</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating</version>
<packaging>maven-plugin</packaging>
<description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
<build>
@@ -101,4 +101,8 @@
<version>3.3</version>
</dependency>
</dependencies>
+
+ <scm>
+ <tag>nifi-nar-maven-plugin-1.0.1-incubating-rc13</tag>
+ </scm>
</project>
[10/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
NIFI-292: Merging NIFI-292 into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/997ed946
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/997ed946
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/997ed946
Branch: refs/heads/master
Commit: 997ed94653b66292c2a9b2d565a5a83f4ccaddb8
Parents: a69ed6b
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri May 1 16:42:44 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri May 1 16:42:44 2015 -0400
----------------------------------------------------------------------
nifi/nifi-assembly/NOTICE | 10 +-
.../src/main/resources/META-INF/NOTICE | 5 +
.../nifi-framework/nifi-client-dto/pom.xml | 26 +-
.../org/apache/nifi/web/api/dto/AboutDTO.java | 7 +
.../org/apache/nifi/web/api/dto/BannerDTO.java | 7 +
.../nifi/web/api/dto/BulletinBoardDTO.java | 7 +
.../apache/nifi/web/api/dto/BulletinDTO.java | 28 +
.../nifi/web/api/dto/BulletinQueryDTO.java | 20 +
.../org/apache/nifi/web/api/dto/ClusterDTO.java | 7 +
.../nifi/web/api/dto/ComponentHistoryDTO.java | 7 +
.../apache/nifi/web/api/dto/ConnectableDTO.java | 29 +
.../apache/nifi/web/api/dto/ConnectionDTO.java | 51 +-
.../web/api/dto/ControllerConfigurationDTO.java | 33 +
.../apache/nifi/web/api/dto/ControllerDTO.java | 50 ++
.../nifi/web/api/dto/ControllerServiceDTO.java | 36 ++
...ontrollerServiceReferencingComponentDTO.java | 40 ++
.../org/apache/nifi/web/api/dto/CounterDTO.java | 16 +
.../apache/nifi/web/api/dto/CountersDTO.java | 7 +
.../nifi/web/api/dto/DocumentedTypeDTO.java | 10 +
.../apache/nifi/web/api/dto/FlowSnippetDTO.java | 28 +
.../org/apache/nifi/web/api/dto/LabelDTO.java | 15 +-
.../nifi/web/api/dto/NiFiComponentDTO.java | 13 +
.../org/apache/nifi/web/api/dto/NodeDTO.java | 34 ++
.../apache/nifi/web/api/dto/NodeEventDTO.java | 10 +
.../web/api/dto/NodeSystemDiagnosticsDTO.java | 7 +
.../org/apache/nifi/web/api/dto/PortDTO.java | 30 +
.../apache/nifi/web/api/dto/PositionDTO.java | 7 +
.../nifi/web/api/dto/PreviousValueDTO.java | 10 +
.../nifi/web/api/dto/ProcessGroupDTO.java | 40 ++
.../nifi/web/api/dto/ProcessorConfigDTO.java | 53 +-
.../apache/nifi/web/api/dto/ProcessorDTO.java | 32 +
.../nifi/web/api/dto/PropertyDescriptorDTO.java | 40 ++
.../nifi/web/api/dto/PropertyHistoryDTO.java | 4 +
.../nifi/web/api/dto/RelationshipDTO.java | 10 +
.../api/dto/RemoteProcessGroupContentsDTO.java | 7 +
.../nifi/web/api/dto/RemoteProcessGroupDTO.java | 51 +-
.../web/api/dto/RemoteProcessGroupPortDTO.java | 31 +
.../nifi/web/api/dto/ReportingTaskDTO.java | 48 +-
.../apache/nifi/web/api/dto/RevisionDTO.java | 12 +
.../org/apache/nifi/web/api/dto/SnippetDTO.java | 50 ++
.../nifi/web/api/dto/SystemDiagnosticsDTO.java | 88 +++
.../apache/nifi/web/api/dto/TemplateDTO.java | 19 +
.../org/apache/nifi/web/api/dto/UserDTO.java | 31 +
.../apache/nifi/web/api/dto/UserGroupDTO.java | 13 +
.../nifi/web/api/dto/action/ActionDTO.java | 31 +
.../nifi/web/api/dto/action/HistoryDTO.java | 10 +
.../web/api/dto/action/HistoryQueryDTO.java | 25 +
.../component/details/ExtensionDetailsDTO.java | 4 +
.../details/RemoteProcessGroupDetailsDTO.java | 4 +
.../dto/action/details/ConfigureDetailsDTO.java | 10 +
.../dto/action/details/ConnectDetailsDTO.java | 22 +
.../api/dto/action/details/MoveDetailsDTO.java | 13 +
.../api/dto/action/details/PurgeDetailsDTO.java | 4 +
.../web/api/dto/provenance/AttributeDTO.java | 10 +
.../web/api/dto/provenance/ProvenanceDTO.java | 28 +
.../api/dto/provenance/ProvenanceEventDTO.java | 125 ++++
.../dto/provenance/ProvenanceOptionsDTO.java | 4 +
.../dto/provenance/ProvenanceRequestDTO.java | 19 +
.../dto/provenance/ProvenanceResultsDTO.java | 22 +
.../ProvenanceSearchableFieldDTO.java | 13 +
.../api/dto/provenance/lineage/LineageDTO.java | 28 +
.../provenance/lineage/LineageRequestDTO.java | 13 +-
.../provenance/lineage/LineageResultsDTO.java | 10 +
.../provenance/lineage/ProvenanceLinkDTO.java | 16 +
.../provenance/lineage/ProvenanceNodeDTO.java | 29 +
.../dto/search/ComponentSearchResultDTO.java | 13 +
.../web/api/dto/search/NodeSearchResultDTO.java | 7 +
.../web/api/dto/search/SearchResultsDTO.java | 22 +
.../dto/search/UserGroupSearchResultDTO.java | 4 +
.../web/api/dto/search/UserSearchResultDTO.java | 7 +
.../dto/status/ClusterConnectionStatusDTO.java | 13 +
.../api/dto/status/ClusterPortStatusDTO.java | 13 +
.../status/ClusterProcessGroupStatusDTO.java | 13 +
.../dto/status/ClusterProcessorStatusDTO.java | 20 +
.../ClusterRemoteProcessGroupStatusDTO.java | 13 +
.../web/api/dto/status/ClusterStatusDTO.java | 4 +
.../api/dto/status/ClusterStatusHistoryDTO.java | 10 +
.../web/api/dto/status/ConnectionStatusDTO.java | 39 +-
.../web/api/dto/status/ControllerStatusDTO.java | 34 ++
.../api/dto/status/NodeConnectionStatusDTO.java | 7 +
.../web/api/dto/status/NodePortStatusDTO.java | 7 +
.../dto/status/NodeProcessGroupStatusDTO.java | 7 +
.../api/dto/status/NodeProcessorStatusDTO.java | 7 +
.../status/NodeRemoteProcessGroupStatusDTO.java | 7 +
.../nifi/web/api/dto/status/NodeStatusDTO.java | 7 +
.../api/dto/status/NodeStatusHistoryDTO.java | 7 +
.../nifi/web/api/dto/status/PortStatusDTO.java | 25 +
.../api/dto/status/ProcessGroupStatusDTO.java | 61 ++
.../web/api/dto/status/ProcessorStatusDTO.java | 38 ++
.../web/api/dto/status/RemotePortStatusDTO.java | 16 +
.../dto/status/RemoteProcessGroupStatusDTO.java | 28 +
.../nifi/web/api/dto/status/StatusDTO.java | 4 +
.../web/api/dto/status/StatusDescriptorDTO.java | 14 +-
.../web/api/dto/status/StatusHistoryDTO.java | 13 +
.../api/dto/status/StatusHistoryDetailDTO.java | 7 +
.../web/api/dto/status/StatusSnapshotDTO.java | 7 +
.../org/apache/nifi/web/api/entity/Entity.java | 4 +
.../nifi-web/nifi-web-api/pom.xml | 137 +++--
.../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 | 77 ++-
.../apache/nifi/web/api/ClusterResource.java | 509 ++++++++++++++--
.../apache/nifi/web/api/ConnectionResource.java | 180 +++++-
.../apache/nifi/web/api/ControllerResource.java | 465 ++++++++++++++-
.../nifi/web/api/ControllerServiceResource.java | 407 +++++++++++--
.../org/apache/nifi/web/api/FunnelResource.java | 179 +++++-
.../apache/nifi/web/api/HistoryResource.java | 279 ++++++++-
.../apache/nifi/web/api/InputPortResource.java | 150 ++++-
.../org/apache/nifi/web/api/LabelResource.java | 150 ++++-
.../org/apache/nifi/web/api/NodeResource.java | 161 ++++-
.../apache/nifi/web/api/OutputPortResource.java | 150 ++++-
.../nifi/web/api/ProcessGroupResource.java | 359 ++++++++++-
.../apache/nifi/web/api/ProcessorResource.java | 208 ++++++-
.../apache/nifi/web/api/ProvenanceResource.java | 327 +++++++++-
.../web/api/RemoteProcessGroupResource.java | 213 ++++++-
.../nifi/web/api/ReportingTaskResource.java | 290 +++++++--
.../apache/nifi/web/api/SnippetResource.java | 173 +++++-
.../nifi/web/api/SystemDiagnosticsResource.java | 41 +-
.../apache/nifi/web/api/TemplateResource.java | 150 ++++-
.../apache/nifi/web/api/UserGroupResource.java | 118 +++-
.../org/apache/nifi/web/api/UserResource.java | 161 ++++-
.../org/apache/nifi/web/api/package-info.java | 43 --
.../src/main/resources/META-INF/NOTICE | 27 -
.../src/main/resources/images/bgNifiLogo.png | Bin 0 -> 4232 bytes
.../src/main/resources/images/nifi16.ico | Bin 0 -> 1150 bytes
.../src/main/resources/templates/endpoint.hbs | 61 ++
.../src/main/resources/templates/example.hbs | 18 +
.../src/main/resources/templates/index.html.hbs | 597 +++++++++++++++++++
.../src/main/resources/templates/operation.hbs | 104 ++++
.../src/main/resources/templates/type.hbs | 55 ++
nifi/pom.xml | 7 +-
132 files changed, 7202 insertions(+), 805 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/NOTICE b/nifi/nifi-assembly/NOTICE
index aadf07a..0edfd96 100644
--- a/nifi/nifi-assembly/NOTICE
+++ b/nifi/nifi-assembly/NOTICE
@@ -467,13 +467,10 @@ The following binary components are provided under the Apache Software License v
Apache Geronimo
Copyright 2003-2008 The Apache Software Foundation
- (ASLv2) Enunciate Core Annotations (org.codehaus.enunciate:enunciate-core-annotations:jar:1.28 - http://dist.codehaus.org/enunciate/enunciate-1.28.zip)
+ (ASLv2) Swagger Core
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/).
+ Swagger Core 1.5.3-M1
+ Copyright 2015 Reverb Technologies, Inc.
(ASLv2) JSON-SMART
The following NOTICE information applies:
@@ -584,7 +581,6 @@ The following binary components are provided under the Common Development and Di
(CDDL 1.0) (GPL3) Streaming API For XML (javax.xml.stream:stax-api:jar:1.0-2 - no url provided)
(CDDL 1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:jar:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
(CDDL 1.0) JavaServer Pages(TM) API (javax.servlet.jsp:jsp-api:jar:2.1 - http://jsp.java.net)
- (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)
************************
Creative Commons Attribution-ShareAlike 3.0
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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/997ed946/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 41454a9..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,24 +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>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java
index 0e2dcb0..83aad41 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/AboutDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -33,6 +34,9 @@ public class AboutDTO {
*
* @return The title
*/
+ @ApiModelProperty(
+ value = "The title to be used on the page and in the about dialog."
+ )
public String getTitle() {
return title;
}
@@ -46,6 +50,9 @@ public class AboutDTO {
*
* @return The version.
*/
+ @ApiModelProperty(
+ value = "The version of this NiFi."
+ )
public String getVersion() {
return version;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java
index 70c408b..c0a691b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -33,6 +34,9 @@ public class BannerDTO {
*
* @return The footer text
*/
+ @ApiModelProperty(
+ value = "The footer text."
+ )
public String getFooterText() {
return footerText;
}
@@ -46,6 +50,9 @@ public class BannerDTO {
*
* @return The header text
*/
+ @ApiModelProperty(
+ value = "The header text."
+ )
public String getHeaderText() {
return headerText;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java
index 5e9440d..455769a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinBoardDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.List;
@@ -35,6 +36,9 @@ public class BulletinBoardDTO {
/**
* @return bulletins to populate in the bulletin board
*/
+ @ApiModelProperty(
+ value = "The bulletins in the bulletin board, that matches the supplied request."
+ )
public List<BulletinDTO> getBulletins() {
return bulletins;
}
@@ -47,6 +51,9 @@ public class BulletinBoardDTO {
* @return when this bulletin board was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when this report was generated."
+ )
public Date getGenerated() {
return generated;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
index 7ae77bb..4c552f6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -40,6 +41,9 @@ public class BulletinDTO {
/**
* @return id of this message
*/
+ @ApiModelProperty(
+ value = "The id of the bulletin."
+ )
public Long getId() {
return id;
}
@@ -51,6 +55,9 @@ public class BulletinDTO {
/**
* @return When clustered, the address of the node from which this bulletin originated
*/
+ @ApiModelProperty(
+ value = "If clustered, the address of the node from whicih the bulletin originated."
+ )
public String getNodeAddress() {
return nodeAddress;
}
@@ -62,6 +69,9 @@ public class BulletinDTO {
/**
* @return group id of the source component
*/
+ @ApiModelProperty(
+ value = "The group id of the source component."
+ )
public String getGroupId() {
return groupId;
}
@@ -73,6 +83,9 @@ public class BulletinDTO {
/**
* @return category of this message
*/
+ @ApiModelProperty(
+ value = "The catagory of this bulletin."
+ )
public String getCategory() {
return category;
}
@@ -84,6 +97,9 @@ public class BulletinDTO {
/**
* @return actual message
*/
+ @ApiModelProperty(
+ value = "The bulletin message."
+ )
public String getMessage() {
return message;
}
@@ -95,6 +111,9 @@ public class BulletinDTO {
/**
* @return id of the source of this message
*/
+ @ApiModelProperty(
+ value = "The id of the source component."
+ )
public String getSourceId() {
return sourceId;
}
@@ -106,6 +125,9 @@ public class BulletinDTO {
/**
* @return name of the source of this message
*/
+ @ApiModelProperty(
+ value = "The name of the source component."
+ )
public String getSourceName() {
return sourceName;
}
@@ -117,6 +139,9 @@ public class BulletinDTO {
/**
* @return level of this bulletin
*/
+ @ApiModelProperty(
+ value = "The level of the bulletin."
+ )
public String getLevel() {
return level;
}
@@ -129,6 +154,9 @@ public class BulletinDTO {
* @return When this bulletin was generated as a formatted string
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "When this bulletin was generated."
+ )
public Date getTimestamp() {
return timestamp;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java
index 4b060f1..e47cdf9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BulletinQueryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -34,6 +35,10 @@ public class BulletinQueryDTO {
/**
* @return Include bulletins after this id
*/
+ @ApiModelProperty(
+ value = "Will include bulletins that occurred after this id. The ids are a one-up number that are used to ensure bulletins that "
+ + "occur at the same time will not be missed."
+ )
public Long getAfter() {
return after;
}
@@ -45,6 +50,9 @@ public class BulletinQueryDTO {
/**
* @return Include bulletin within this group. Supports a regular expression
*/
+ @ApiModelProperty(
+ value = "Will include bulletins that occurred within this group. Supports a regular expression."
+ )
public String getGroupId() {
return groupId;
}
@@ -56,6 +64,9 @@ public class BulletinQueryDTO {
/**
* @return Include bulletins that match this message. Supports a regular expression
*/
+ @ApiModelProperty(
+ value = "Will include bulletins that match this message. Supports a regular expression."
+ )
public String getMessage() {
return message;
}
@@ -67,6 +78,9 @@ public class BulletinQueryDTO {
/**
* @return Include bulletins that match this name. Supports a regular expression
*/
+ @ApiModelProperty(
+ value = "Will include bulletins that match this name. Supports a regular expression."
+ )
public String getName() {
return name;
}
@@ -78,6 +92,9 @@ public class BulletinQueryDTO {
/**
* @return Include bulletins that match this id. Supports a source id
*/
+ @ApiModelProperty(
+ value = "Will include bulletins from components that match this id. Supports a regular expression."
+ )
public String getSourceId() {
return sourceId;
}
@@ -89,6 +106,9 @@ public class BulletinQueryDTO {
/**
* @return The maximum number of bulletins to return
*/
+ @ApiModelProperty(
+ value = "The maximum number of bulletins to return."
+ )
public Integer getLimit() {
return limit;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java
index 161e788..66e19d7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ClusterDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
@@ -35,6 +36,9 @@ public class ClusterDTO {
/**
* @return collection of the node DTOs
*/
+ @ApiModelProperty(
+ value = "The collection of nodes that are part of the cluster."
+ )
public Collection<NodeDTO> getNodes() {
return nodes;
}
@@ -47,6 +51,9 @@ public class ClusterDTO {
* @return the date/time that this report was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp the report was generated."
+ )
public Date getGenerated() {
return generated;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java
index 2345b08..7cf4f73 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ComponentHistoryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Map;
import javax.xml.bind.annotation.XmlType;
@@ -31,6 +32,9 @@ public class ComponentHistoryDTO {
/**
* @return component id
*/
+ @ApiModelProperty(
+ value = "The component id."
+ )
public String getComponentId() {
return componentId;
}
@@ -42,6 +46,9 @@ public class ComponentHistoryDTO {
/**
* @return history for this components properties
*/
+ @ApiModelProperty(
+ value = "The history for the properties of the component."
+ )
public Map<String, PropertyHistoryDTO> getPropertyHistory() {
return propertyHistory;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java
index 7432a72..22c167f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectableDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -36,6 +37,10 @@ public class ConnectableDTO {
/**
* @return id of this connectable component
*/
+ @ApiModelProperty(
+ value = "The id of the connectable component.",
+ required = true
+ )
public String getId() {
return id;
}
@@ -47,6 +52,11 @@ public class ConnectableDTO {
/**
* @return type of this connectable component
*/
+ @ApiModelProperty(
+ value = "The type of component the connectable is.",
+ required = true,
+ allowableValues = "PROCESSOR, REMOTE_INPUT_PORT, REMOTE_OUTPUT_PORT, INPUT_PORT, OUTPUT_PORT, FUNNEL"
+ )
public String getType() {
return type;
}
@@ -58,6 +68,10 @@ public class ConnectableDTO {
/**
* @return id of the group that this connectable component resides in
*/
+ @ApiModelProperty(
+ value = "The id of the group that the connectable component resides in",
+ required = true
+ )
public String getGroupId() {
return groupId;
}
@@ -69,6 +83,9 @@ public class ConnectableDTO {
/**
* @return name of this connectable component
*/
+ @ApiModelProperty(
+ value = "The name of the connectable component"
+ )
public String getName() {
return name;
}
@@ -80,6 +97,9 @@ public class ConnectableDTO {
/**
* @return Used to reflect the current state of this Connectable
*/
+ @ApiModelProperty(
+ value = "Reflects the current state of the connectable component."
+ )
public Boolean isRunning() {
return running;
}
@@ -91,6 +111,9 @@ public class ConnectableDTO {
/**
* @return If this represents a remote port it is used to indicate whether the target exists
*/
+ @ApiModelProperty(
+ value = "If the connectable component represents a remote port, indicates if the target exists."
+ )
public Boolean getExists() {
return exists;
}
@@ -102,6 +125,9 @@ public class ConnectableDTO {
/**
* @return If this represents a remote port it is used to indicate whether is it configured to transmit
*/
+ @ApiModelProperty(
+ value = "If the connectable component represents a remote port, indicates if the target is configured to transmit."
+ )
public Boolean getTransmitting() {
return transmitting;
}
@@ -113,6 +139,9 @@ public class ConnectableDTO {
/**
* @return The comments from this Connectable
*/
+ @ApiModelProperty(
+ value = "The comments for the connectable component."
+ )
public String getComments() {
return comments;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java
index 432f80a..96da9e3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ConnectionDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -41,10 +42,13 @@ public class ConnectionDTO extends NiFiComponentDTO {
private List<PositionDTO> bends;
/**
- * The id of the source processor.
+ * The source of this connection.
*
- * @return The id of the source processor
+ * @return The source of this connection
*/
+ @ApiModelProperty(
+ value = "The source of the connection."
+ )
public ConnectableDTO getSource() {
return source;
}
@@ -54,10 +58,13 @@ public class ConnectionDTO extends NiFiComponentDTO {
}
/**
- * The id of the target processor.
+ * The destination of this connection.
*
- * @return The id of the target processor
+ * @return The destination of this connection
*/
+ @ApiModelProperty(
+ value = "The destination of the connection."
+ )
public ConnectableDTO getDestination() {
return destination;
}
@@ -69,6 +76,9 @@ public class ConnectionDTO extends NiFiComponentDTO {
/**
* @return name of the connection
*/
+ @ApiModelProperty(
+ value = "The name of the connection."
+ )
public String getName() {
return name;
}
@@ -80,6 +90,9 @@ public class ConnectionDTO extends NiFiComponentDTO {
/**
* @return position of the bend points on this connection
*/
+ @ApiModelProperty(
+ value = "The bend points on the connection."
+ )
public List<PositionDTO> getBends() {
return bends;
}
@@ -91,6 +104,9 @@ public class ConnectionDTO extends NiFiComponentDTO {
/**
* @return The index of control point that the connection label should be placed over
*/
+ @ApiModelProperty(
+ value = "The index of the bend point where to place the connection label."
+ )
public Integer getLabelIndex() {
return labelIndex;
}
@@ -102,6 +118,9 @@ public class ConnectionDTO extends NiFiComponentDTO {
/**
* @return z index for this connection
*/
+ @ApiModelProperty(
+ value = "The z index of the connection."
+ )
public Long getzIndex() {
return zIndex;
}
@@ -115,6 +134,9 @@ public class ConnectionDTO extends NiFiComponentDTO {
*
* @return The relationships
*/
+ @ApiModelProperty(
+ value = "The selected relationship that comprise the connection."
+ )
public Set<String> getSelectedRelationships() {
return selectedRelationships;
}
@@ -126,6 +148,10 @@ public class ConnectionDTO extends NiFiComponentDTO {
/**
* @return relationships that the source of the connection currently supports. This property is read only
*/
+ @ApiModelProperty(
+ value = "The relationships that the source of the connection currently supports. This property is read only.",
+ readOnly = true
+ )
public Set<String> getAvailableRelationships() {
return availableRelationships;
}
@@ -140,6 +166,10 @@ public class ConnectionDTO extends NiFiComponentDTO {
*
* @return The back pressure object threshold
*/
+ @ApiModelProperty(
+ value = "The object count threshold for determining when back pressure is applied. Updating this value is a passive change in the sense that it won't impact whether existing files "
+ + "over the limit are affected but it does help feeder processors to stop pushing too much into this work queue."
+ )
public Long getBackPressureObjectThreshold() {
return backPressureObjectThreshold;
}
@@ -154,6 +184,10 @@ public class ConnectionDTO extends NiFiComponentDTO {
*
* @return The back pressure data size threshold
*/
+ @ApiModelProperty(
+ value = "The object data size threshold for determining when back pressure is applied. Updating this value is a passive change in the sense that it won't impact whether existing "
+ + "files over the limit are affected but it does help feeder processors to stop pushing too much into this work queue."
+ )
public String getBackPressureDataSizeThreshold() {
return backPressureDataSizeThreshold;
}
@@ -168,6 +202,10 @@ public class ConnectionDTO extends NiFiComponentDTO {
*
* @return The flow file expiration in minutes
*/
+ @ApiModelProperty(
+ value = "The amount of time a flow file may be in the flow before it will be automatically aged out of the flow. Once a flow file reaches this age it will be terminated from "
+ + "the flow the next time a processor attempts to start work on it."
+ )
public String getFlowFileExpiration() {
return flowFileExpiration;
}
@@ -177,10 +215,13 @@ public class ConnectionDTO extends NiFiComponentDTO {
}
/**
- * The prioritizers this processor is using.
+ * The prioritizers this connection is using.
*
* @return The prioritizer list
*/
+ @ApiModelProperty(
+ value = "The comparators used to prioritize the queue."
+ )
public List<String> getPrioritizers() {
return prioritizers;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
index c6f36f3..9f92598 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerConfigurationDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -44,6 +45,9 @@ public class ControllerConfigurationDTO {
/**
* @return maximum number of timer driven threads this NiFi has available
*/
+ @ApiModelProperty(
+ value = "The maimum number of timer driven threads the NiFi has available."
+ )
public Integer getMaxTimerDrivenThreadCount() {
return maxTimerDrivenThreadCount;
}
@@ -55,6 +59,9 @@ public class ControllerConfigurationDTO {
/**
* @return maximum number of event driven thread this NiFi has available
*/
+ @ApiModelProperty(
+ value = "The maximum number of event driven threads the NiFi has avaiable."
+ )
public Integer getMaxEventDrivenThreadCount() {
return maxEventDrivenThreadCount;
}
@@ -66,6 +73,9 @@ public class ControllerConfigurationDTO {
/**
* @return name of this NiFi
*/
+ @ApiModelProperty(
+ value = "The name of this NiFi."
+ )
public String getName() {
return name;
}
@@ -77,6 +87,9 @@ public class ControllerConfigurationDTO {
/**
* @return comments for this NiFi
*/
+ @ApiModelProperty(
+ value = "The comments for this NiFi."
+ )
public String getComments() {
return comments;
}
@@ -88,6 +101,10 @@ public class ControllerConfigurationDTO {
/**
* @return interval in seconds between the automatic NiFi refresh requests. This value is read only
*/
+ @ApiModelProperty(
+ value = "The interval in seconds between the automatic NiFi refresh requests.",
+ readOnly = true
+ )
public Long getAutoRefreshIntervalSeconds() {
return autoRefreshIntervalSeconds;
}
@@ -99,6 +116,10 @@ public class ControllerConfigurationDTO {
/**
* @return Indicates whether or not Site-to-Site communications with this instance is secure (2-way authentication). This value is read only
*/
+ @ApiModelProperty(
+ value = "Indicates whether site to site communication with the NiFi is secure (requires 2-way authenticiation).",
+ readOnly = true
+ )
public Boolean isSiteToSiteSecure() {
return siteToSiteSecure;
}
@@ -111,6 +132,9 @@ public class ControllerConfigurationDTO {
* @return current time on the server
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The current time on the system."
+ )
public Date getCurrentTime() {
return currentTime;
}
@@ -122,6 +146,9 @@ public class ControllerConfigurationDTO {
/**
* @return time offset of the server
*/
+ @ApiModelProperty(
+ value = "The time offset of the system."
+ )
public Integer getTimeOffset() {
return timeOffset;
}
@@ -133,6 +160,9 @@ public class ControllerConfigurationDTO {
/**
* @return the URL for the content viewer if configured
*/
+ @ApiModelProperty(
+ value = "The URL for the content viewer if configured."
+ )
public String getContentViewerUrl() {
return contentViewerUrl;
}
@@ -144,6 +174,9 @@ public class ControllerConfigurationDTO {
/**
* @return URI for this NiFi controller
*/
+ @ApiModelProperty(
+ value = "The URI for the NiFi."
+ )
public String getUri() {
return uri;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
index 34008e0..a47adcf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -48,6 +49,9 @@ public class ControllerDTO {
/**
* @return id of this NiFi controller
*/
+ @ApiModelProperty(
+ value = "The id of the NiFi."
+ )
public String getId() {
return id;
}
@@ -61,6 +65,9 @@ public class ControllerDTO {
*
* @return The name of this controller
*/
+ @ApiModelProperty(
+ value = "The name of the NiFi."
+ )
public String getName() {
return name;
}
@@ -72,6 +79,9 @@ public class ControllerDTO {
/**
* @return comments of this NiFi controller
*/
+ @ApiModelProperty(
+ value = "The comments for the NiFi."
+ )
public String getComments() {
return comments;
}
@@ -83,6 +93,9 @@ public class ControllerDTO {
/**
* @return input ports available to send data to this NiFi controller
*/
+ @ApiModelProperty(
+ value = "The input ports available to send data to for the NiFi."
+ )
public Set<PortDTO> getInputPorts() {
return inputPorts;
}
@@ -94,6 +107,9 @@ public class ControllerDTO {
/**
* @return output ports available to received data from this NiFi controller
*/
+ @ApiModelProperty(
+ value = "The output ports available to received data from the NiFi."
+ )
public Set<PortDTO> getOutputPorts() {
return outputPorts;
}
@@ -105,6 +121,9 @@ public class ControllerDTO {
/**
* @return Instance ID of the cluster, if this node is connected to a Cluster Manager, or of this individual instance of in standalone mode
*/
+ @ApiModelProperty(
+ value = "If clustered, the id of the Cluster Manager, otherwise the id of the NiFi."
+ )
public String getInstanceId() {
return instanceId;
}
@@ -118,6 +137,10 @@ public class ControllerDTO {
*
* @return a integer between 1 and 65535, or null, if not configured for remote transfer
*/
+ @ApiModelProperty(
+ value = "The Socket Port on which this instance is listening for Remote Transfers of Flow Files. If this instance is not configured to receive Flow Files from remote "
+ + "instances, this will be null."
+ )
public Integer getRemoteSiteListeningPort() {
return remoteSiteListeningPort;
}
@@ -129,6 +152,9 @@ public class ControllerDTO {
/**
* @return Indicates whether or not Site-to-Site communications with this instance is secure (2-way authentication)
*/
+ @ApiModelProperty(
+ value = "Indicates whether or not Site-to-Site communications with this instance is secure (2-way authentication)."
+ )
public Boolean isSiteToSiteSecure() {
return siteToSiteSecure;
}
@@ -140,6 +166,9 @@ public class ControllerDTO {
/**
* @return number of running components in this process group
*/
+ @ApiModelProperty(
+ value = "The number of running components in the NiFi."
+ )
public Integer getRunningCount() {
return runningCount;
}
@@ -151,6 +180,9 @@ public class ControllerDTO {
/**
* @return number of stopped components in this process group
*/
+ @ApiModelProperty(
+ value = "The number of stopped components in the NiFi."
+ )
public Integer getStoppedCount() {
return stoppedCount;
}
@@ -162,6 +194,9 @@ public class ControllerDTO {
/**
* @return number of active remote ports contained in this process group
*/
+ @ApiModelProperty(
+ value = "The number of active remote ports contained in the NiFi."
+ )
public Integer getActiveRemotePortCount() {
return activeRemotePortCount;
}
@@ -173,6 +208,9 @@ public class ControllerDTO {
/**
* @return number of inactive remote ports contained in this process group
*/
+ @ApiModelProperty(
+ value = "The number of inactive remote porst contained in the NiFi."
+ )
public Integer getInactiveRemotePortCount() {
return inactiveRemotePortCount;
}
@@ -184,6 +222,9 @@ public class ControllerDTO {
/**
* @return number of input ports contained in this process group
*/
+ @ApiModelProperty(
+ value = "The number of input ports contained in the NiFi."
+ )
public Integer getInputPortCount() {
return inputPortCount;
}
@@ -195,6 +236,9 @@ public class ControllerDTO {
/**
* @return number of invalid components in this process group
*/
+ @ApiModelProperty(
+ value = "The number of invalid components in the NiFi."
+ )
public Integer getInvalidCount() {
return invalidCount;
}
@@ -206,6 +250,9 @@ public class ControllerDTO {
/**
* @return number of disabled components in this process group
*/
+ @ApiModelProperty(
+ value = "The number of disabled components in the NiFi."
+ )
public Integer getDisabledCount() {
return disabledCount;
}
@@ -217,6 +264,9 @@ public class ControllerDTO {
/**
* @return number of output ports in this process group
*/
+ @ApiModelProperty(
+ value = "The number of output ports in the NiFi."
+ )
public Integer getOutputPortCount() {
return outputPortCount;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
index 8394705..3abd7f2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -46,6 +47,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return controller service name
*/
+ @ApiModelProperty(
+ value = "The name of the controller service."
+ )
public String getName() {
return name;
}
@@ -57,6 +61,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return the controller service type
*/
+ @ApiModelProperty(
+ value = "The type of the controller service."
+ )
public String getType() {
return type;
}
@@ -68,6 +75,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return the comment for the Controller Service
*/
+ @ApiModelProperty(
+ value = "The comments for the controller service."
+ )
public String getComments() {
return comments;
}
@@ -79,6 +89,10 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return Where this service is available. Possible values are NCM, NODE
*/
+ @ApiModelProperty(
+ value = "Where the servcie is available.",
+ allowableValues = "NCM, NODE"
+ )
public String getAvailability() {
return availability;
}
@@ -90,6 +104,10 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return The state of this controller service. Possible values are ENABLED, ENABLING, DISABLED, DISABLING
*/
+ @ApiModelProperty(
+ value = "The state of the controller service.",
+ allowableValues = "ENABLED, ENABLING, DISABLED, DISABLING"
+ )
public String getState() {
return state;
}
@@ -101,6 +119,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return controller service properties
*/
+ @ApiModelProperty(
+ value = "The properties of the controller service."
+ )
public Map<String, String> getProperties() {
return properties;
}
@@ -112,6 +133,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return descriptors for the controller service properties
*/
+ @ApiModelProperty(
+ value = "The descriptors for the controller service properties."
+ )
public Map<String, PropertyDescriptorDTO> getDescriptors() {
return descriptors;
}
@@ -123,6 +147,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return the URL for this controller services custom configuration UI if applicable. Null otherwise
*/
+ @ApiModelProperty(
+ value = "The URL for the controller services custom configuration UI if applicable."
+ )
public String getCustomUiUrl() {
return customUiUrl;
}
@@ -134,6 +161,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return annotation data for this controller service
*/
+ @ApiModelProperty(
+ value = "The annontation for the controller service. This is how the custom UI relays configuration to the controller service."
+ )
public String getAnnotationData() {
return annotationData;
}
@@ -145,6 +175,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
/**
* @return all components referencing this controller service
*/
+ @ApiModelProperty(
+ value = "All components referencing this controller service."
+ )
public Set<ControllerServiceReferencingComponentDTO> getReferencingComponents() {
return referencingComponents;
}
@@ -158,6 +191,9 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
*
* @return The validation errors
*/
+ @ApiModelProperty(
+ value = "The validation errors from the controller service. These validation errors represent the problems with the controller service that must be resolved before it can be enabled."
+ )
public Collection<String> getValidationErrors() {
return validationErrors;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
index f927122..f4290ff 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceReferencingComponentDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -47,6 +48,10 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return Group id for this component referencing a controller service. If this component is another service, this field is blank
*/
+ @ApiModelProperty(
+ value = "The group id for the component referencing a controller service. If this component is another controller service or a reporting "
+ + "task, this field is blank."
+ )
public String getGroupId() {
return groupId;
}
@@ -58,6 +63,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return id for this component referencing a controller service
*/
+ @ApiModelProperty(
+ value = "The id of the component referencing a controller service."
+ )
public String getId() {
return id;
}
@@ -69,6 +77,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return name for this component referencing a controller service
*/
+ @ApiModelProperty(
+ value = "The name of the component referencing a controller service."
+ )
public String getName() {
return name;
}
@@ -80,6 +91,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return type for this component referencing a controller service
*/
+ @ApiModelProperty(
+ value = "The type of the component referencing a controller service."
+ )
public String getType() {
return type;
}
@@ -91,6 +105,10 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return state of the processor referencing a controller service. If this component is another service, this field is blank
*/
+ @ApiModelProperty(
+ value = "The state of a processor or reporting task referencing a controller service. If this component is another controller "
+ + "service, this field is blank."
+ )
public String getState() {
return state;
}
@@ -102,6 +120,10 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return type of reference this is (Processor, ControllerService, or ReportingTask)
*/
+ @ApiModelProperty(
+ value = "The type of reference this is.",
+ allowableValues = "Processor, ControllerService, or ReportingTask"
+ )
public String getReferenceType() {
return referenceType;
}
@@ -113,6 +135,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return component properties
*/
+ @ApiModelProperty(
+ value = "The properties for the component."
+ )
public Map<String, String> getProperties() {
return properties;
}
@@ -124,6 +149,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return descriptors for the components properties
*/
+ @ApiModelProperty(
+ value = "The descriptors for the componet properties."
+ )
public Map<String, PropertyDescriptorDTO> getDescriptors() {
return descriptors;
}
@@ -135,6 +163,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return Any validation error associated with this component
*/
+ @ApiModelProperty(
+ value = "The validation errors for the component."
+ )
public Collection<String> getValidationErrors() {
return validationErrors;
}
@@ -146,6 +177,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return active thread count for the referencing component
*/
+ @ApiModelProperty(
+ value = "The number of active threads for the referencing component."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
@@ -157,6 +191,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return If this referencing component represents a ControllerService, these are the components that reference it
*/
+ @ApiModelProperty(
+ value = "If the referencing component represents a controller service, these are the components that referenc it."
+ )
public Set<ControllerServiceReferencingComponentDTO> getReferencingComponents() {
return referencingComponents;
}
@@ -168,6 +205,9 @@ public class ControllerServiceReferencingComponentDTO {
/**
* @return If this referencing component represents a ControllerService, this indicates whether it has already been represented in this hierarchy
*/
+ @ApiModelProperty(
+ value = "If the referencing component represents a controller service, this indicates whether it has already been represented in this hierarchy."
+ )
public Boolean getReferenceCycle() {
return referenceCycle;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
index 7f47bf5..615ad93 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CounterDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -33,6 +34,9 @@ public class CounterDTO {
/**
* @return context of the counter
*/
+ @ApiModelProperty(
+ value = "The context of the counter."
+ )
public String getContext() {
return context;
}
@@ -44,6 +48,9 @@ public class CounterDTO {
/**
* @return id of the counter
*/
+ @ApiModelProperty(
+ value = "The id of the counter."
+ )
public String getId() {
return id;
}
@@ -55,6 +62,9 @@ public class CounterDTO {
/**
* @return name of the counter
*/
+ @ApiModelProperty(
+ value = "The name of the counter."
+ )
public String getName() {
return name;
}
@@ -66,6 +76,9 @@ public class CounterDTO {
/**
* @return value for the counter
*/
+ @ApiModelProperty(
+ value = "The value of the counter."
+ )
public String getValue() {
return value;
}
@@ -74,6 +87,9 @@ public class CounterDTO {
this.value = value;
}
+ @ApiModelProperty(
+ value = "The value count."
+ )
public Long getValueCount() {
return valueCount;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
index d9f45e3..0f162c9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/CountersDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
@@ -35,6 +36,9 @@ public class CountersDTO {
/**
* @return the collection of counters
*/
+ @ApiModelProperty(
+ value = "All counters in the NiFi."
+ )
public Collection<CounterDTO> getCounters() {
return counters;
}
@@ -47,6 +51,9 @@ public class CountersDTO {
* @return the date/time that this report was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when the report was generated."
+ )
public Date getGenerated() {
return generated;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
index 2241d62..f82ff6c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/DocumentedTypeDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -32,6 +33,9 @@ public class DocumentedTypeDTO {
/**
* @return An optional description of the corresponding type
*/
+ @ApiModelProperty(
+ value = "The description of the type."
+ )
public String getDescription() {
return description;
}
@@ -43,6 +47,9 @@ public class DocumentedTypeDTO {
/**
* @return The type is the fully-qualified name of a Java class
*/
+ @ApiModelProperty(
+ value = "The fulley qualified name of the type."
+ )
public String getType() {
return type;
}
@@ -54,6 +61,9 @@ public class DocumentedTypeDTO {
/**
* @return The tags associated with this type
*/
+ @ApiModelProperty(
+ value = "The tags associated with this type."
+ )
public Set<String> getTags() {
return tags;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
index 5aec78f..1ce390e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowSnippetDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -39,6 +40,9 @@ public class FlowSnippetDTO {
/**
* @return connections in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The connections in this flow snippet."
+ )
public Set<ConnectionDTO> getConnections() {
return connections;
}
@@ -50,6 +54,9 @@ public class FlowSnippetDTO {
/**
* @return input ports in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The input ports in this flow snippet."
+ )
public Set<PortDTO> getInputPorts() {
return inputPorts;
}
@@ -61,6 +68,9 @@ public class FlowSnippetDTO {
/**
* @return labels in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The labels in this flow snippet."
+ )
public Set<LabelDTO> getLabels() {
return labels;
}
@@ -72,6 +82,9 @@ public class FlowSnippetDTO {
/**
* @return funnels in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The funnels in this flow snippet."
+ )
public Set<FunnelDTO> getFunnels() {
return funnels;
}
@@ -83,6 +96,9 @@ public class FlowSnippetDTO {
/**
* @return output ports in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The output ports in this flow snippet."
+ )
public Set<PortDTO> getOutputPorts() {
return outputPorts;
}
@@ -94,6 +110,9 @@ public class FlowSnippetDTO {
/**
* @return process groups in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The process groups in this flow snippet."
+ )
public Set<ProcessGroupDTO> getProcessGroups() {
return processGroups;
}
@@ -105,6 +124,9 @@ public class FlowSnippetDTO {
/**
* @return processors in this flow group
*/
+ @ApiModelProperty(
+ value = "The processors in this flow snippet."
+ )
public Set<ProcessorDTO> getProcessors() {
return processors;
}
@@ -116,6 +138,9 @@ public class FlowSnippetDTO {
/**
* @return remote process groups in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The remote process groups in this flow snippet."
+ )
public Set<RemoteProcessGroupDTO> getRemoteProcessGroups() {
return remoteProcessGroups;
}
@@ -127,6 +152,9 @@ public class FlowSnippetDTO {
/**
* @return the Controller Services in this flow snippet
*/
+ @ApiModelProperty(
+ value = "The controller services in this flow snippet."
+ )
public Set<ControllerServiceDTO> getControllerServices() {
return controllerServices;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
index d15ceb4..e9016db 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/LabelDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Map;
import javax.xml.bind.annotation.XmlType;
@@ -32,7 +33,7 @@ public class LabelDTO extends NiFiComponentDTO {
private Double height;
// font-size = 12px
- // color = #eee
+ // background-color = #eee
private Map<String, String> style;
public LabelDTO() {
@@ -43,6 +44,9 @@ public class LabelDTO extends NiFiComponentDTO {
*
* @return The label text
*/
+ @ApiModelProperty(
+ value = "The text that appears in the label."
+ )
public String getLabel() {
return label;
}
@@ -54,6 +58,9 @@ public class LabelDTO extends NiFiComponentDTO {
/**
* @return style for this label
*/
+ @ApiModelProperty(
+ value = "The styles for this label (font-size => 12px, background-color => #eee, etc)."
+ )
public Map<String, String> getStyle() {
return style;
}
@@ -65,6 +72,9 @@ public class LabelDTO extends NiFiComponentDTO {
/**
* @return height of the label in pixels when at a 1:1 scale
*/
+ @ApiModelProperty(
+ value = "The height of the label in pixels when at a 1:1 scale."
+ )
public Double getHeight() {
return height;
}
@@ -76,6 +86,9 @@ public class LabelDTO extends NiFiComponentDTO {
/**
* @return width of the label in pixels when at a 1:1 scale
*/
+ @ApiModelProperty(
+ value = "The width of the label in pixels when at a 1:1 scale."
+ )
public Double getWidth() {
return width;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
index 074a2e3..e89fb5d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NiFiComponentDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -46,6 +47,9 @@ public class NiFiComponentDTO {
*
* @return The id
*/
+ @ApiModelProperty(
+ value = "The id of the component."
+ )
public String getId() {
return this.id;
}
@@ -57,6 +61,9 @@ public class NiFiComponentDTO {
/**
* @return id for the parent group of this component if applicable, null otherwise
*/
+ @ApiModelProperty(
+ value = "The id of parent process group of this component if applicable."
+ )
public String getParentGroupId() {
return parentGroupId;
}
@@ -70,6 +77,9 @@ public class NiFiComponentDTO {
*
* @return The uri
*/
+ @ApiModelProperty(
+ value = "The URI for futures requests to the component."
+ )
public String getUri() {
return uri;
}
@@ -87,6 +97,9 @@ public class NiFiComponentDTO {
*
* @return The position
*/
+ @ApiModelProperty(
+ value = "The position of this component in the UI if applicable."
+ )
public PositionDTO getPosition() {
return position;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
index 6aae62f..f0aa9c4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -44,6 +45,9 @@ public class NodeDTO {
* @return node's last heartbeat timestamp
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "the time of the nodes's last heartbeat."
+ )
public Date getHeartbeat() {
return heartbeat;
}
@@ -56,6 +60,9 @@ public class NodeDTO {
* @return time of the node's last connection request
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time of the node's last connection request."
+ )
public Date getConnectionRequested() {
return connectionRequested;
}
@@ -69,6 +76,9 @@ public class NodeDTO {
*
* @return The active thread count
*/
+ @ApiModelProperty(
+ value = "The active threads for the NiFi on the node."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
@@ -80,6 +90,9 @@ public class NodeDTO {
/**
* @return queue for the controller
*/
+ @ApiModelProperty(
+ value = "The queue the NiFi on the node."
+ )
public String getQueued() {
return queued;
}
@@ -91,6 +104,9 @@ public class NodeDTO {
/**
* @return node's host/IP address
*/
+ @ApiModelProperty(
+ value = "The node's host/ip address."
+ )
public String getAddress() {
return address;
}
@@ -102,6 +118,9 @@ public class NodeDTO {
/**
* @return node ID
*/
+ @ApiModelProperty(
+ value = "The id of the node."
+ )
public String getNodeId() {
return nodeId;
}
@@ -113,6 +132,9 @@ public class NodeDTO {
/**
* @return port the node is listening for API requests
*/
+ @ApiModelProperty(
+ value = "The port the node is listening for API requests."
+ )
public Integer getApiPort() {
return apiPort;
}
@@ -124,6 +146,9 @@ public class NodeDTO {
/**
* @return node's status
*/
+ @ApiModelProperty(
+ value = "The node's status."
+ )
public String getStatus() {
return status;
}
@@ -135,6 +160,9 @@ public class NodeDTO {
/**
* @return node's events
*/
+ @ApiModelProperty(
+ value = "The node's events."
+ )
public List<NodeEventDTO> getEvents() {
return events;
}
@@ -146,6 +174,9 @@ public class NodeDTO {
/**
* @return whether this node is the primary node within the cluster
*/
+ @ApiModelProperty(
+ value = "Whether the node is the primary node within the cluster."
+ )
public Boolean isPrimary() {
return primary;
}
@@ -158,6 +189,9 @@ public class NodeDTO {
* @return time at which this Node was last restarted
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time at which this Node was last refreshed."
+ )
public Date getNodeStartTime() {
return nodeStartTime;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
index 7d8273f..f0b61a7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeEventDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -34,6 +35,9 @@ public class NodeEventDTO {
/**
* @return category of the node event
*/
+ @ApiModelProperty(
+ value = "The category of the node event."
+ )
public String getCategory() {
return category;
}
@@ -45,6 +49,9 @@ public class NodeEventDTO {
/**
* @return message of the node event
*/
+ @ApiModelProperty(
+ value = "The message in the node event."
+ )
public String getMessage() {
return message;
}
@@ -57,6 +64,9 @@ public class NodeEventDTO {
* @return timestamp of the node event
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp of the node event."
+ )
public Date getTimestamp() {
return timestamp;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
index f7aff79..8f925aa 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/NodeSystemDiagnosticsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -30,6 +31,9 @@ public class NodeSystemDiagnosticsDTO {
/**
* @return the node
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -41,6 +45,9 @@ public class NodeSystemDiagnosticsDTO {
/**
* @return the system diagnostics
*/
+ @ApiModelProperty(
+ value = "The diagnostics for the system the node is on."
+ )
public SystemDiagnosticsDTO getSystemDiagnostics() {
return systemDiagnostics;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
index 6a90723..489ed0c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PortDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -40,6 +41,9 @@ public class PortDTO extends NiFiComponentDTO {
/**
* @return name of this port
*/
+ @ApiModelProperty(
+ value = "The name of the port."
+ )
public String getName() {
return name;
}
@@ -51,6 +55,10 @@ public class PortDTO extends NiFiComponentDTO {
/**
* @return The state of this port. Possible states are 'RUNNING', 'STOPPED', and 'DISABLED'
*/
+ @ApiModelProperty(
+ value = "The state of the port.",
+ allowableValues = "RUNNING, STOPPED, DISABLED"
+ )
public String getState() {
return state;
}
@@ -64,6 +72,10 @@ public class PortDTO extends NiFiComponentDTO {
*
* @return The type of port
*/
+ @ApiModelProperty(
+ value = "The type of port.",
+ allowableValues = "INPUT_PORT, OUTPUT_PORT"
+ )
public String getType() {
return type;
}
@@ -75,6 +87,9 @@ public class PortDTO extends NiFiComponentDTO {
/**
* @return number of tasks that should be concurrently scheduled for this port
*/
+ @ApiModelProperty(
+ value = "The number of tasks that should be concurrently scheduled for the port."
+ )
public Integer getConcurrentlySchedulableTaskCount() {
return concurrentlySchedulableTaskCount;
}
@@ -86,6 +101,9 @@ public class PortDTO extends NiFiComponentDTO {
/**
* @return comments for this port
*/
+ @ApiModelProperty(
+ value = "The comments for the port."
+ )
public String getComments() {
return comments;
}
@@ -97,6 +115,9 @@ public class PortDTO extends NiFiComponentDTO {
/**
* @return whether this port has incoming or outgoing connections to a remote NiFi. This is only applicable when the port is running on the root group
*/
+ @ApiModelProperty(
+ value = "Whether the port has incoming or output connections to a remote NiFi. This is only applicable when the port is running in the root group."
+ )
public Boolean isTransmitting() {
return transmitting;
}
@@ -108,6 +129,9 @@ public class PortDTO extends NiFiComponentDTO {
/**
* @return groups that are allowed to access this port
*/
+ @ApiModelProperty(
+ value = "The user groups that are allowed to access the port."
+ )
public Set<String> getGroupAccessControl() {
return groupAccessControl;
}
@@ -119,6 +143,9 @@ public class PortDTO extends NiFiComponentDTO {
/**
* @return users that are allowed to access this port
*/
+ @ApiModelProperty(
+ value = "The users that are allowed to access the port."
+ )
public Set<String> getUserAccessControl() {
return userAccessControl;
}
@@ -132,6 +159,9 @@ public class PortDTO extends NiFiComponentDTO {
*
* @return The validation errors
*/
+ @ApiModelProperty(
+ value = "Gets the validation errors from this port. These validation errors represent the problems with the port that must be resolved before it can be started."
+ )
public Collection<String> getValidationErrors() {
return validationErrors;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
index 5b0f386..ef42387 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PositionDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -39,6 +40,9 @@ public class PositionDTO {
/**
* @return the x coordinate
*/
+ @ApiModelProperty(
+ value = "The x coordinate."
+ )
public Double getX() {
return x;
}
@@ -50,6 +54,9 @@ public class PositionDTO {
/**
* @return the y coordinate
*/
+ @ApiModelProperty(
+ value = "The y coordinate."
+ )
public Double getY() {
return y;
}
[39/54] [abbrv] incubator-nifi git commit: NIFI-584 remove javadoc
author tags.
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java
index 6b03c74..9616ad3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoResponseFromNodesException.java
@@ -20,7 +20,6 @@ package org.apache.nifi.cluster.manager.exception;
* Represents the exceptional case when the cluster is unable to service a request because no nodes returned a response. When the given request is not mutable the nodes are left in their previous
* state.
*
- * @author unattributed
*/
public class NoResponseFromNodesException extends ClusterException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java
index b2102ff..2f59eed 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeDisconnectionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a disconnection request to a node failed.
*
- * @author unattributed
*/
public class NodeDisconnectionException extends ClusterException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java
index 8c40cef..be3edf4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NodeReconnectionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a reconnection request to a node failed.
*
- * @author unattributed
*/
public class NodeReconnectionException extends ClusterException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java
index 0fbaebc..5750382 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/PrimaryRoleAssignmentException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when the cluster is unable to update the primary role of a node.
*
- * @author unattributed
*/
public class PrimaryRoleAssignmentException extends IllegalClusterStateException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java
index 03710f5..05d2435 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/SafeModeMutableRequestException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a HTTP request that may change a node's dataflow is to be replicated while the cluster is in safe mode.
*
- * @author unattributed
*/
public class SafeModeMutableRequestException extends MutableRequestException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java
index d2070d1..2d43e8a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UnknownNodeException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a request is made for a node that does not exist.
*
- * @author unattributed
*/
public class UnknownNodeException extends ClusterException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java
index 27b5312..325ffa0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/UriConstructionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a URI cannot be constructed from the given information. This exception is similar to Java's URISyntaxException except that it extends RuntimeException.
*
- * @author unattributed
*/
public class UriConstructionException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java
index de274b1..c11df05 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java
@@ -37,7 +37,6 @@ import org.slf4j.LoggerFactory;
*
* If no 2XX responses were received, then the node's flow has not changed. Instead of disconnecting everything, we only disconnect the nodes with internal errors, i.e., 5XX responses.
*
- * @author unattributed
*/
public class HttpResponseMapperImpl implements HttpResponseMapper {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index d3a24e7..24204a4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@ -241,7 +241,6 @@ import org.apache.nifi.web.api.entity.ReportingTasksEntity;
*
* The start() and stop() methods must be called to initialize and stop the instance.
*
- * @author unattributed
*/
public class WebClusterManager implements HttpClusterManager, ProtocolHandler, ControllerServiceProvider, ReportingTaskProvider {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
index bc05b89..95da615 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/node/Node.java
@@ -33,7 +33,6 @@ import org.slf4j.LoggerFactory;
*
* This class overrides hashCode and equals and considers two instances to be equal if they have the equal NodeIdentifiers.
*
- * @author unattributed
*/
public class Node implements Cloneable, Comparable<Node> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java
index 99c0a5a..e823d27 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/event/impl/EventManagerImplTest.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
/**
- * @author unattributed
*/
public class EventManagerImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
index f9ba016..3d00d3b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java
@@ -56,7 +56,6 @@ import org.w3c.dom.Element;
import org.xml.sax.SAXException;
/**
- * @author unattributed
*/
public class DataFlowManagementServiceImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java
index a7e877e..b02eac0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java
@@ -47,7 +47,6 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
- * @author unattributed
*/
public class HttpRequestReplicatorImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java
index 048ef2f..ebea63a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/impl/HttpResponseMapperImplTest.java
@@ -35,7 +35,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * @author unattributed
*/
public class HttpResponseMapperImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
index 544cd58..4c3eeee 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java
@@ -32,7 +32,6 @@ import org.apache.commons.lang3.StringUtils;
/**
* Encapsulates an HTTP request. The toString method returns the specification-compliant request.
*
- * @author unattributed
*/
public class HttpRequest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java
index e8fd620..7ae4806 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponse.java
@@ -24,7 +24,6 @@ import javax.ws.rs.core.Response.Status;
/**
* Encapsulates an HTTP response. The toString method returns the specification-compliant response.
*
- * @author unattributed
*/
public class HttpResponse {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java
index d4f9f96..a2899cf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpResponseAction.java
@@ -21,7 +21,6 @@ package org.apache.nifi.cluster.manager.testutils;
*
* This class is good for simulating network latency.
*
- * @author unattributed
*/
public class HttpResponseAction {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java
index bab3ca0..3621475 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/testutils/HttpServer.java
@@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory;
/**
* A simple HTTP web server that allows clients to register canned-responses to respond to received requests.
*
- * @author unattributed
*/
public class HttpServer {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
index 572f8d6..075f2cf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/StandardFlowFileQueue.java
@@ -56,7 +56,6 @@ import org.slf4j.LoggerFactory;
* A FlowFileQueue is used to queue FlowFile objects that are awaiting further
* processing. Must be thread safe.
*
- * @author none
*/
public final class StandardFlowFileQueue implements FlowFileQueue {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java
index 6ce7ba6..5aeb5c5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/repository/ContentNotFoundException.java
@@ -20,7 +20,6 @@ import org.apache.nifi.controller.repository.claim.ContentClaim;
/**
*
- * @author none
*/
public class ContentNotFoundException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java
index 1249657..77d6620 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/BulletinsPayload.java
@@ -34,7 +34,6 @@ import org.apache.nifi.reporting.Bulletin;
/**
* The payload of the bulletins.
*
- * @author unattributed
*/
@XmlRootElement
public class BulletinsPayload {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/ConnectionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/ConnectionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/ConnectionException.java
index 986e904..1d42729 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/ConnectionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/ConnectionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster;
/**
* Represents the exceptional case when connection to the cluster fails.
*
- * @author unattributed
*/
public class ConnectionException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java
index 55707f3..bf2f78c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/DisconnectionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster;
/**
* Represents the exceptional case when disconnection from the cluster fails.
*
- * @author unattributed
*/
public class DisconnectionException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
index 668c5e0..5414259 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java
@@ -36,7 +36,6 @@ import org.apache.nifi.jaxb.CounterAdapter;
/**
* The payload of the heartbeat. The payload contains status to inform the cluster manager the current workload of this node.
*
- * @author unattributed
*/
@XmlRootElement
public class HeartbeatPayload {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java
index 444b9e5..6f8025b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.controller;
/**
* Represents the exceptional case when flow configuration is malformed and therefore, cannot be serialized or deserialized.
*
- * @author unattributed
*/
public class FlowSerializationException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializer.java
index 0528674..1a4aed3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializer.java
@@ -21,7 +21,6 @@ import java.io.OutputStream;
/**
* Serializes the flow configuration of a controller instance to an output stream.
*
- * @author unattributed
*/
public interface FlowSerializer {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java
index 68673b4..00c6c5d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizationException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.controller;
/**
* Represents the exceptional case when a controller managing an existing flow fails to fully load a different flow.
*
- * @author unattributed
*/
public class FlowSynchronizationException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java
index 275f816..d505db6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSynchronizer.java
@@ -20,7 +20,6 @@ import org.apache.nifi.cluster.protocol.DataFlow;
import org.apache.nifi.encrypt.StringEncryptor;
/**
- * @author unattributed
*/
public interface FlowSynchronizer {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
index 5448174..bc515fe 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java
@@ -101,7 +101,6 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
/**
- * @author unattributed
*/
public class StandardFlowSynchronizer implements FlowSynchronizer {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 7820b7b..cbd0f88 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -70,7 +70,6 @@ import org.slf4j.LoggerFactory;
* ProcessorNode provides thread-safe access to a FlowFileProcessor as it exists within a controlled flow. This node keeps track of the processor, its scheduling information and its relationships to
* other processors and whatever scheduled futures exist for it. Must be thread safe.
*
- * @author none
*/
public class StandardProcessorNode extends ProcessorNode implements Connectable {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java
index 2f9f0f8..1b4f9d9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/UninheritableFlowException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.controller;
/**
* Represents the exceptional case when a controller is to be loaded with a flow that is fundamentally different than its existing flow.
*
- * @author unattributed
*/
public class UninheritableFlowException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java
index 1937d0d..904b330 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/ProcessContext.java
@@ -34,7 +34,6 @@ import org.apache.nifi.util.Connectables;
/**
*
- * @author none
*/
public class ProcessContext {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java
index 6bb5e35..6524cd3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardFlowFileRecord.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
*
* <b>Immutable - Thread Safe</b>
*
- * @author none
*/
public final class StandardFlowFileRecord implements FlowFile, FlowFileRecord {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 2c032d3..2b05b47 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -85,7 +85,6 @@ import org.slf4j.LoggerFactory;
* <p>
* NOT THREAD SAFE</p>
* <p/>
- * @author none
*/
public final class StandardProcessSession implements ProcessSession, ProvenanceEventEnricher {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java
index ed73dc9..a84c2a7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java
@@ -17,7 +17,6 @@
package org.apache.nifi.diagnostics;
/**
- * @author unattributed
*/
public final class DiagnosticUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java
index 0dd13e8..50e1741 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/StorageUsage.java
@@ -19,7 +19,6 @@ package org.apache.nifi.diagnostics;
/**
* Disk usage for a file system directory.
*
- * @author unattributed
*/
public class StorageUsage implements Cloneable {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
index 16284f3..2d77e70 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java
@@ -22,7 +22,6 @@ import java.util.Map;
/**
* Diagnostics for the JVM.
*
- * @author unattributed
*/
public class SystemDiagnostics implements Cloneable {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
index 6b85db3..da3f603 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java
@@ -38,7 +38,6 @@ import org.slf4j.LoggerFactory;
/**
* A factory for creating system diagnostics.
*
- * @author unattributed
*/
public class SystemDiagnosticsFactory {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java
index 77c0cad..b51b28b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/encrypt/EncryptionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.encrypt;
/**
* Represents the exceptional case when an encrypt or decrypt fails.
*
- * @author unattributed
*/
public class EncryptionException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java
index 332be06..7c3b9bc 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintException.java
@@ -17,7 +17,6 @@
package org.apache.nifi.fingerprint;
/**
- * @author unattributed
*/
public class FingerprintException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java
index c7e4140..a0ac6b4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java
@@ -17,7 +17,6 @@
package org.apache.nifi.jaxb;
/**
- * @author unattributed
*/
public class AdaptedCounter {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java
index be8c0e0..b699348 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java
@@ -22,7 +22,6 @@ import org.apache.nifi.events.BulletinFactory;
import org.apache.nifi.reporting.Bulletin;
/**
- * @author unattributed
*/
public class BulletinAdapter extends XmlAdapter<AdaptedBulletin, Bulletin> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java
index 7041cf2..2620b46 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/jaxb/CounterAdapter.java
@@ -21,7 +21,6 @@ import org.apache.nifi.controller.Counter;
import org.apache.nifi.controller.StandardCounter;
/**
- * @author unattributed
*/
public class CounterAdapter extends XmlAdapter<AdaptedCounter, Counter> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
index 72b129c..8633dd9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycle.java
@@ -19,7 +19,6 @@ package org.apache.nifi.lifecycle;
/**
* Represents a start/stop lifecyle for a component. <code>start</code> should only be called once per lifecyle unless otherwise documented by implementing classes.
*
- * @author unattributed
*/
public interface LifeCycle {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java
index d3bf2bf..ee39337 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.lifecycle;
/**
* The base exception for issues encountered during the lifecycle of a class implementing the <code>LifeCycle</code> interface.
*
- * @author unattributed
*/
public class LifeCycleException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java
index 725d840..398d97e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStartException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.lifecycle;
/**
* Represents the exceptional case when a problem is encountered during the startup or initialization of a class implementing the <code>LifeCycle</code> interface.
*
- * @author unattributed
*/
public class LifeCycleStartException extends LifeCycleException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java
index 910e0a8..8b12745 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.lifecycle;
/**
* Represents the exceptional case when a problem is encountered during the shutdown of a class implementing the <code>LifeCycle</code> interface.
*
- * @author unattributed
*/
public class LifeCycleStopException extends LifeCycleException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java
index e59a8d4..8519bb0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/services/FlowService.java
@@ -31,7 +31,6 @@ import org.apache.nifi.lifecycle.LifeCycle;
/**
* Defines the API level services available for carrying out file-based dataflow operations.
*
- * @author unattributed
*/
public interface FlowService extends LifeCycle {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java
index 9205b7c..d6bfca0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java
@@ -31,7 +31,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
/**
- * @author unattributed
*/
public class HeartbeatPayloadTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java
index 36ebf17..7dc44da 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java
@@ -46,7 +46,6 @@ import org.junit.Ignore;
import org.junit.Test;
/**
- * @author unattributed
*/
@Ignore
public class StandardFlowServiceTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
index 3db6cfc..ae9624b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java
@@ -26,7 +26,6 @@ import org.junit.Before;
import org.junit.Test;
/**
- * @author unattributed
*/
public class FingerprintFactoryTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
index 9b1772b..9bbc3a3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/ExtensionManager.java
@@ -42,7 +42,6 @@ import org.slf4j.LoggerFactory;
* FlowFileComparators, and ReportingTasks using the service provider API and
* running through all classloaders (root, NARs).
*
- * @author none
* @ThreadSafe - is immutable
*/
@SuppressWarnings("rawtypes")
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
index 42bea01..9e147b0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/util/FileUtils.java
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
* A utility class containing a few useful static methods to do typical IO
* operations.
*
- * @author unattributed
*/
public class FileUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
index b70b829..3d7fd27 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextCreationException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.framework.security.util;
/**
* Represents the exceptional case when a SSL context failed creation.
*
- * @author unattributed
*/
public class SslContextCreationException extends SslException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
index 82a6458..754bd81 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslContextFactory.java
@@ -35,7 +35,6 @@ import org.apache.commons.lang3.StringUtils;
* A factory for creating SSL contexts using the application's security
* properties.
*
- * @author unattributed
*/
public final class SslContextFactory {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
index e623a4c..cae2043 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.framework.security.util;
/**
* Base class for SSL related exceptions.
*
- * @author unattributed
*/
public class SslException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
index faa726a..83ccb88 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslServerSocketFactoryCreationException.java
@@ -20,7 +20,6 @@ package org.apache.nifi.framework.security.util;
* Represents the exceptional case when a SslServerSocketFactory failed
* creation.
*
- * @author unattributed
*/
public class SslServerSocketFactoryCreationException extends SslException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
index 02c242e..492c3db 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/main/java/org/apache/nifi/framework/security/util/SslSocketFactoryCreationException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.framework.security.util;
/**
* Represents the exceptional case when a SslSocketFactory failed creation.
*
- * @author unattributed
*/
public class SslSocketFactoryCreationException extends SslException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
index 8ecb798..ff1276c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * @author unattributed
*/
public class SslContextFactoryTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java
index 962ea21..eff93f8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/aop/MethodProfiler.java
@@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory;
/**
*
- * @author unattrib
*/
public class MethodProfiler {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.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/filter/NodeRequestFilter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java
index 13a8bde..68a693c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java
@@ -48,7 +48,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
*
* Since this header may be faked, we only make decisions about the header if the application instance is a node and connected to the cluster.
*
- * @author unattributed
*/
public class NodeRequestFilter implements Filter {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.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/filter/RequestLogger.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
index d0f0093..bfd2df6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/RequestLogger.java
@@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory;
/**
* A filter to log requests.
*
- * @author unattributed
*/
public class RequestLogger implements Filter {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.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/filter/ThreadLocalFilter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java
index dcff8db..053727b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java
@@ -28,7 +28,6 @@ import org.apache.nifi.cluster.context.ClusterContextThreadLocal;
/**
* A filter to remove the threadlocal configuration.
*
- * @author unattributed
*/
public class ThreadLocalFilter implements Filter {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.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/filter/TimerFilter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.java
index 56c17a2..a50d1b9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/filter/TimerFilter.java
@@ -36,7 +36,6 @@ import org.slf4j.LoggerFactory;
/**
* A filter to time requests.
*
- * @author unattributed
*/
public class TimerFilter implements Filter {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
index f28617a..8df8835 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
@@ -19,7 +19,6 @@ package org.apache.nifi.web;
/**
* Provides access to content within NiFi.
*
- * @author unattributed
*/
public interface ContentAccess {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
index 3cb1d45..e92be01 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/OptimisticLockingManager.java
@@ -21,7 +21,6 @@ package org.apache.nifi.web;
* of a client ID and a version number. Two revisions are considered equal if
* either their version numbers match or their client IDs match.
*
- * @author unattributed
*/
public interface OptimisticLockingManager {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java
index 6ac0fdd..7792f0e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/src/main/java/org/apache/nifi/web/StandardOptimisticLockingManager.java
@@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory;
/**
* Implements the OptimisticLockingManager interface.
*
- * @author unattributed
*/
public class StandardOptimisticLockingManager implements OptimisticLockingManager {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java
index a1b6717..bf1fe43 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java
@@ -28,7 +28,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
* Utility methods for retrieving information about the current application
* user.
*
- * @author unattributed
*/
public final class NiFiUserUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java
index 94b6c2f..f45682b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java
@@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletResponse;
* A filter to set a response header directing IE to use the most recent
* document mode.
*
- * @author unattributed
*/
public class IeEdgeHeader implements Filter {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java
index 38f2aae..896e4d8 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java
@@ -104,7 +104,6 @@ public class KeyValueReader implements SequenceFileReader<Set<FlowFile>> {
/**
* Serializes the key and value and writes to the flow file's output stream.
*
- * @author unattributed
*
*/
static class KeyValueWriterCallback implements OutputStreamCallback {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java
index e5f29dd..e954721 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/util/OutputStreamWritable.java
@@ -30,7 +30,6 @@ import org.apache.hadoop.io.Writable;
/**
* This class will write to an output stream, rather than an in-memory buffer, the fields being read.
*
- * @author unattributed
*
*/
public class OutputStreamWritable implements Writable {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
index 63fd55b..76512dc 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java
@@ -108,7 +108,6 @@ import org.apache.nifi.stream.io.StreamUtils;
* </ul>
* <p>
*
- * @author unattributed
*/
@EventDriven
@SupportsBatching
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
index 7cba650..69107dd 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
@@ -54,7 +54,6 @@ import org.apache.nifi.processor.util.StandardValidators;
* each corresponding relationship. If none of the supplied expressions matches for a given FlowFile, that FlowFile will be routed to the 'unmatched' relationship.
* </p>
*
- * @author unattributed
*/
@EventDriven
@SideEffectFree
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
index 90440a5..df61650 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/BinManager.java
@@ -34,7 +34,6 @@ import org.apache.nifi.processor.ProcessSession;
/**
* This class is thread safe
*
- * @author none
*/
public class BinManager {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
index adaba5c..0090024 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/FTPUtils.java
@@ -34,7 +34,6 @@ import org.apache.commons.net.ftp.FTPClient;
/**
*
- * @author developer
*/
public class FTPUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
index ad2cca5..6170509 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java
@@ -41,7 +41,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
/**
*
- * @author none
*/
public class UDPStreamConsumer implements StreamConsumer {
[23/54] [abbrv] incubator-nifi git commit: NIFI-563: binary assembly
should not include redundant LICENSE and NOTICE from docs artifact.
Posted by ma...@apache.org.
NIFI-563: binary assembly should not include redundant LICENSE and NOTICE from docs artifact.
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c2128876
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c2128876
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c2128876
Branch: refs/heads/master
Commit: c21288763d2b85e9dad1aff0fe952bac27c4f1e8
Parents: f59491c
Author: Sean Busbey <bu...@apache.org>
Authored: Thu Apr 30 00:20:41 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun May 3 20:01:45 2015 -0400
----------------------------------------------------------------------
nifi/nifi-assembly/src/main/assembly/dependencies.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c2128876/nifi/nifi-assembly/src/main/assembly/dependencies.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/src/main/assembly/dependencies.xml b/nifi/nifi-assembly/src/main/assembly/dependencies.xml
index 8480c14..27eb32d 100644
--- a/nifi/nifi-assembly/src/main/assembly/dependencies.xml
+++ b/nifi/nifi-assembly/src/main/assembly/dependencies.xml
@@ -104,6 +104,11 @@
<unpack>true</unpack>
<unpackOptions>
<filtered>false</filtered>
+ <excludes>
+ <!-- LICENSE and NOTICE both covered by top-level -->
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
[32/54] [abbrv] incubator-nifi git commit: Adding my key
Posted by ma...@apache.org.
Adding my key
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/251f0e53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/251f0e53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/251f0e53
Branch: refs/heads/master
Commit: 251f0e53b06191c2f55fccc19ac4912c6c7f05b8
Parents: cf3dbef
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue May 5 23:06:07 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue May 5 23:06:07 2015 -0400
----------------------------------------------------------------------
KEYS | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/251f0e53/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index cac752f..2ac2377 100644
--- a/KEYS
+++ b/KEYS
@@ -144,3 +144,61 @@ lLqlJSFiuV7mNyu7u15/EO9S+ITRYdvsncRRYYdQdYZCyvgxP038P2WUeyRMtQSp
F9jzEw==
=IZsE
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/432AEE37 2015-05-04
+uid Matt Gilman (CODE SIGNING KEY) <mc...@apache.org>
+sig 3 432AEE37 2015-05-04 Matt Gilman (CODE SIGNING KEY) <mc...@apache.org>
+sub 4096R/69B51990 2015-05-04
+sig 432AEE37 2015-05-04 Matt Gilman (CODE SIGNING KEY) <mc...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFVHcNsBEADbogfcroNIO8PbGENtCr4VISn2ZSW3XVBUv4xhiZeH/M/horu9
+IwtQmWilbJi20nraEbYg4rxxuNDSt+EjN0zb1yVfISmfzIXrTclE2wbHWdUbjaRA
+kdxkBKt2Gc7x0OEONfOFKP26hF24zMN7348iwzjML610P0yaMoDT1kwt36qpr5d7
+dIy+e+6zJ4p6ypyqyG+scxPzC2QFQmwPtRAvgbnHRPwsef0zo3qLc7Otvw+0MiC8
+qxFsdiCzc8yLnebHzWTyqZdkp/TRoVGi8m5OMrKRmiOBhcGwK31Z7cDlwfzHNt3O
+wYEUFDw2cA/8k8S2ctkybJGiBXgDjZoGjGpocAbObrcZq9iCn0k8x3MY3yqTA+7h
+BVNQXmydh1Sj0fAI/CUMDvSEdTPwSK93W4sj7p0fyL8eSunCXDAWtmfRFLsB8BPC
+o4g5SH1Q8VvW4LRaFrrvWL//2v+y+klF3FMaInKPtHP96F5ZI2VMgQrL1UjX/bq5
+ctEym6pH887eUcxR7OvpQEZZm3dw1/LAk7ZN18hGeJuoZ2R97Q9gdP4r8p09Rj6n
+bzGPh1N4NuwTo2Xs20ESW5UiJh96O0mqJ2kB8GrvitxOVqnUwaAUQvUgFVR7m941
+yNSddMbmCznj7eYngC8AGVsjzU2L1dJDjfHFHKNJ3pgZcjZkpIwT3imlBwARAQAB
+tDRNYXR0IEdpbG1hbiAoQ09ERSBTSUdOSU5HIEtFWSkgPG1jZ2lsbWFuQGFwYWNo
+ZS5vcmc+iQI3BBMBAgAhAhsDAh4BAheABQJVR3KCBQsJCAcDBRUKCQgLBRYCAwEA
+AAoJEN9h7BlDKu432C4QAJ8y0lGgxIKiLEBAsmm/E/bh2Eaw8YeWj/zbQT3IGh/G
+vFKCec2NZSGdObgD8mg4SieW6nYW/GZSMtlsVawCB4kavD6TKeYacq90E7nqeWJm
+4oZxiWuQuPuJgPqJJMmk0aiUb9EiZRFQqYmDOsrXausxbcVzpzQwKTrKyzWIO7hT
+79ii+D/bdDYL10bju/9gmFvzAABnolL98fstr/sJcoZBd4FmWXdEFR2oXONukqJB
+rRGiAny1q+5QwQdHs7nNVewFjuu9AzibOY5omPGJLTsfH+aBgrpIAg4vFlG4H6tn
+RnB5VcxtOfr8b0xIjPIV93HtlU4Vfft1pIJxULknbKDArpam3wVYLNmsyRmD1AKY
+Xumii1Rzf10k6jxUJuK8EdvbrSjfNWuaZ1lVi9robKhpYZ3oVEikOmg8nD4aSMJ6
+a2i16GgmZ+QHUbFdaSEtNftptlxtFI31LzjLRX3EOsQJ96J+frmzH9I+Vjxys6DH
+TTPuvANQViaxgEJ8I73OntTsuywqXXOg67+Eyz4ieeYDdxGnKBK/n8pl1xLUvyN9
+K55a9/Lk26mRNsRFxSp37gTHCcYDgDkC4BA4fxvakl/IAAdXxjXg92sQ9A27qNcw
+OqzlnGd7yobwtgGqHXM9ORgnDXl6zuRLXjYMGjTrwuhbbSHxqt/huvpWISTEJe59
+uQINBFVHcNsBEADFVADjCu8IZi/lNPRoTZv+QVqAuFfIVHaX2Niu1RUVvm1yIqCr
+Kba5b88vQJjn2iDTMP+1Kcv/szhIli0TZENUE6hg/vZpbJVumDqb9QkdOlxVWzug
+3jUIu4ZxY4sqfLLAawlYzgnm/Nl4URrUoh1bUEdTrfW+gaLLGgiUsDWHMDQVr7KU
+sJtR0RVcFm7fCjfqDyaYPGsrRHftH585Ym9e72fj7E4C/9gYOwJqBMkvD8rClCKf
+4GpJKYbD8/np3uhU/hE2T+Jso+z/9ROiFN1EsiqWyyPzClVFDdh65LERxZfFbQ3s
+T1jml0vuW7szxoHWMh+ruivl+ojL27GtJ9QHMS83ie4XNDDG2NZiShi+dKb4/a3C
+cKTcDtL0vlwUHHXEjwZXmG2ZcwkAiUC42cLYmgfucdG0oBLpWbvqH4GBEH6rzx3s
+QVihhS30/U12dEBRZ/5emgzJ3NSuS3T/3JGrmB9sbY6GhmGM3O/8/R1rfOoO1Y1d
+wak9GJhzvromLK70P9dfYy1u/rWbLDmoJf6xcqIVHlr7jWj1dhx0q1vsXwdGOCLZ
+6NOpigrSxFTW+iHDPOxG7dQYbDfimCUdrF+eK+W9CjoIntdfUqJSivwpkhnfOYMZ
+Jva7x84cxtKT2W5+flNiw448j30RQtDNhZwjAUvORbGiyWYm9boiPR5FMQARAQAB
+iQIfBBgBAgAJBQJVR3DbAhsMAAoJEN9h7BlDKu43AR0P/A7ZJsEl/bwRZpENKPWB
+Ynb0xEhZ0hDclKCEpT41c87Ft6gxEJ+mFofLdS+NCcGXDv+zQtkATLqRlrRXFTBS
+VULtDFnTC0GpYFa/zVhVmPZERD2PexrSUs4YlmddYGNJODTiQ407jFQDLIYAzim6
+r025MwzIvu8QLBJ+MJoysvZgzWCH9bq702LQm69ax/pj9LEvYQPLimCBpRzuwvCB
+P/XuxMEyKt/3521SRTsmEQ75TPoApBMyds1ykT4uwUrxIu3e+Hov7WxHUYWT9hy5
+1rETKu6/vMhmA3ivdFN06/sImJ3LZnJBp21CCj/kb9UjVFotiQaBsWW0nkaDQ9Nu
+ndwQaGV6bgHlvFBryG44lYIVE5ZkETYSTXy66AeUZ4rOw5sEpJD29iYb8qqvxKIj
+pUe0a2pG2z6V3hS/btgvvrojroBxs80DohaA9R46+g4KK5Pv6ps+CVCWigSW1S66
+mhoQwhDC2CHObMDkywmFUOvJoEGFmNndnZmnLlH4mofjbH4zBbM7jldQGFW55j8p
+qM3m3uQikpC5YAogpX6B1oMGTmqkFOKKkKjEmfngc4+BpGgMON/iw6Nq8DIjKRM7
+iZTTlg8bBsOEKzTIpC6P0Dz/xTu2Ge9VoAi17ssGjYjXMbzrX7+NLjP8FafLezQx
+xbKM3K7lORLPg4LK0hcG2ZaO
+=gvH7
+-----END PGP PUBLIC KEY BLOCK-----
[43/54] [abbrv] incubator-nifi git commit: NIFI-598
Posted by ma...@apache.org.
NIFI-598
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/1dce27ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1dce27ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1dce27ff
Branch: refs/heads/master
Commit: 1dce27ff2cfe20e6ee5dcf103d5bc56975e94c60
Parents: b760505
Author: joewitt <jo...@apache.org>
Authored: Fri May 8 22:48:42 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Fri May 8 22:48:42 2015 -0400
----------------------------------------------------------------------
nifi/nifi-assembly/pom.xml | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/1dce27ff/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index f25f0a1..1ac52bb 100644
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@ -261,8 +261,7 @@ language governing permissions and limitations under the License. -->
<nifi.provenance.repository.rollover.size>100 MB</nifi.provenance.repository.rollover.size>
<nifi.provenance.repository.query.threads>2</nifi.provenance.repository.query.threads>
<nifi.provenance.repository.compress.on.rollover>true</nifi.provenance.repository.compress.on.rollover>
- <nifi.provenance.repository.indexed.fields>EventType, FlowFileUUID,
- Filename, ProcessorID</nifi.provenance.repository.indexed.fields>
+ <nifi.provenance.repository.indexed.fields>EventType, FlowFileUUID, Filename, ProcessorID</nifi.provenance.repository.indexed.fields>
<nifi.provenance.repository.indexed.attributes />
<nifi.provenance.repository.index.shard.size>500 MB</nifi.provenance.repository.index.shard.size>
<nifi.provenance.repository.always.sync>false</nifi.provenance.repository.always.sync>
@@ -302,8 +301,7 @@ language governing permissions and limitations under the License. -->
<nifi.security.ocsp.responder.url />
<nifi.security.ocsp.responder.certificate />
- <!-- nifi.properties: cluster common properties (cluster manager and nodes
- must have same values) -->
+ <!-- nifi.properties: cluster common properties (cluster manager and nodes must have same values) -->
<nifi.cluster.protocol.heartbeat.interval>5 sec</nifi.cluster.protocol.heartbeat.interval>
<nifi.cluster.protocol.is.secure>false</nifi.cluster.protocol.is.secure>
<nifi.cluster.protocol.socket.timeout>30 sec</nifi.cluster.protocol.socket.timeout>
@@ -315,8 +313,7 @@ language governing permissions and limitations under the License. -->
<nifi.cluster.protocol.multicast.service.locator.attempts>3</nifi.cluster.protocol.multicast.service.locator.attempts>
<nifi.cluster.protocol.multicast.service.locator.attempts.delay>1 sec</nifi.cluster.protocol.multicast.service.locator.attempts.delay>
- <!-- nifi.properties: cluster node properties (only configure for cluster
- nodes) -->
+ <!-- nifi.properties: cluster node properties (only configure for cluster nodes) -->
<nifi.cluster.is.node>false</nifi.cluster.is.node>
<nifi.cluster.node.address />
<nifi.cluster.node.protocol.port />
@@ -324,8 +321,7 @@ language governing permissions and limitations under the License. -->
<nifi.cluster.node.unicast.manager.address />
<nifi.cluster.node.unicast.manager.protocol.port />
- <!-- nifi.properties: cluster manager properties (only configure for cluster
- manager) -->
+ <!-- nifi.properties: cluster manager properties (only configure for cluster manager) -->
<nifi.cluster.is.manager>false</nifi.cluster.is.manager>
<nifi.cluster.manager.address />
<nifi.cluster.manager.protocol.port />
@@ -382,10 +378,8 @@ language governing permissions and limitations under the License. -->
<artifactId>rpm-maven-plugin</artifactId>
<configuration>
<summary>Apache NiFi (incubating)</summary>
- <description>Apache Nifi (incubating) is dataflow system based on
- the Flow-Based Programming concepts.</description>
- <license>Apache License, Version 2.0 and others (see included
- LICENSE file)</license>
+ <description>Apache Nifi (incubating) is dataflow system based on the Flow-Based Programming concepts.</description>
+ <license>Apache License, Version 2.0 and others (see included LICENSE file)</license>
<url>http://nifi.incubator.apache.org</url>
<group>Utilities</group>
<prefix>/opt/nifi</prefix>
[52/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare release
nifi-0.1.0-incubating-rc13
Posted by ma...@apache.org.
NIFI-429: prepare release nifi-0.1.0-incubating-rc13
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/65a07b6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/65a07b6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/65a07b6b
Branch: refs/heads/master
Commit: 65a07b6b634e04f44b5b89bfaf95e0ff35c3c68c
Parents: 32909ea
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 14:21:13 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 14:21:13 2015 -0400
----------------------------------------------------------------------
nifi/nifi-api/pom.xml | 2 +-
nifi/nifi-assembly/pom.xml | 13 +-
nifi/nifi-bootstrap/pom.xml | 2 +-
.../nifi-data-provenance-utils/pom.xml | 2 +-
.../nifi-expression-language/pom.xml | 2 +-
.../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +-
.../nifi-hl7-query-language/pom.xml | 5 +-
nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +-
.../nifi-processor-utilities/pom.xml | 2 +-
nifi/nifi-commons/nifi-properties/pom.xml | 2 +-
nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +-
.../nifi-site-to-site-client/pom.xml | 4 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +-
nifi/nifi-commons/pom.xml | 2 +-
nifi/nifi-docs/pom.xml | 2 +-
nifi/nifi-external/nifi-spark-receiver/pom.xml | 2 +-
nifi/nifi-external/pom.xml | 2 +-
.../nifi-processor-bundle-archetype/pom.xml | 2 +-
nifi/nifi-maven-archetypes/pom.xml | 2 +-
nifi/nifi-mock/pom.xml | 2 +-
.../nifi-aws-bundle/nifi-aws-nar/pom.xml | 72 +++++-----
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 142 +++++++++----------
nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 86 +++++------
.../nifi-framework-nar/pom.xml | 2 +-
.../nifi-framework/nifi-administration/pom.xml | 2 +-
.../nifi-framework/nifi-client-dto/pom.xml | 2 +-
.../nifi-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-framework/nifi-documentation/pom.xml | 80 +++++------
.../nifi-file-authorization-provider/pom.xml | 2 +-
.../nifi-framework-cluster-protocol/pom.xml | 2 +-
.../nifi-framework-cluster-web/pom.xml | 2 +-
.../nifi-framework-cluster/pom.xml | 2 +-
.../nifi-framework-core-api/pom.xml | 2 +-
.../nifi-framework/nifi-framework-core/pom.xml | 2 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../nifi-framework/nifi-runtime/pom.xml | 2 +-
.../nifi-framework/nifi-security/pom.xml | 2 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 2 +-
.../nifi-framework/nifi-user-actions/pom.xml | 2 +-
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +-
.../nifi-web/nifi-ui-extension/pom.xml | 2 +-
.../nifi-web/nifi-web-api/pom.xml | 2 +-
.../nifi-web/nifi-web-content-access/pom.xml | 2 +-
.../nifi-web/nifi-web-content-viewer/pom.xml | 2 +-
.../nifi-web/nifi-web-docs/pom.xml | 2 +-
.../nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web-optimistic-locking/pom.xml | 2 +-
.../nifi-web/nifi-web-security/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
.../nifi-framework/nifi-web/pom.xml | 12 +-
.../nifi-framework/pom.xml | 2 +-
.../nifi-framework-bundle/pom.xml | 38 ++---
.../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +-
.../nifi-geo-bundle/nifi-geo-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 4 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +-
.../nifi-hdfs-processors/pom.xml | 2 +-
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 2 +-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 4 +-
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 4 +-
nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +-
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +-
.../nifi-kafka-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +-
.../nifi-kite-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 4 +-
.../nifi-language-translation-nar/pom.xml | 4 +-
.../nifi-yandex-processors/pom.xml | 2 +-
.../nifi-language-translation-bundle/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 2 +-
.../nifi-volatile-provenance-repository/pom.xml | 2 +-
.../nifi-provenance-repository-bundle/pom.xml | 6 +-
.../nifi-social-media-nar/pom.xml | 4 +-
.../nifi-twitter-processors/pom.xml | 2 +-
.../nifi-social-media-bundle/pom.xml | 2 +-
.../nifi-solr-bundle/nifi-solr-nar/pom.xml | 4 +-
.../nifi-solr-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml | 2 +-
.../nifi-standard-content-viewer/pom.xml | 2 +-
.../nifi-standard-nar/pom.xml | 2 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-standard-processors/pom.xml | 2 +-
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../nifi-standard-bundle/pom.xml | 10 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-distributed-cache-protocol/pom.xml | 2 +-
.../nifi-distributed-cache-server/pom.xml | 2 +-
.../nifi-distributed-cache-services-nar/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-http-context-map-api/pom.xml | 2 +-
.../nifi-http-context-map-nar/pom.xml | 2 +-
.../nifi-http-context-map/pom.xml | 2 +-
.../nifi-http-context-map-bundle/pom.xml | 2 +-
.../nifi-load-distribution-service-api/pom.xml | 2 +-
.../nifi-ssl-context-nar/pom.xml | 2 +-
.../nifi-ssl-context-service/pom.xml | 2 +-
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../nifi-standard-services-api-nar/pom.xml | 2 +-
.../nifi-standard-services/pom.xml | 2 +-
.../nifi-update-attribute-model/pom.xml | 2 +-
.../nifi-update-attribute-nar/pom.xml | 2 +-
.../nifi-update-attribute-processor/pom.xml | 2 +-
.../nifi-update-attribute-ui/pom.xml | 2 +-
.../nifi-update-attribute-bundle/pom.xml | 8 +-
nifi/nifi-nar-bundles/pom.xml | 30 ++--
nifi/pom.xml | 84 +++++------
118 files changed, 409 insertions(+), 409 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/pom.xml b/nifi/nifi-api/pom.xml
index 0321a43..cab5522 100644
--- a/nifi/nifi-api/pom.xml
+++ b/nifi/nifi-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index 1ac52bb..d74c275 100644
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@ -9,13 +9,12 @@ 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-assembly</artifactId>
<packaging>pom</packaging>
@@ -171,25 +170,25 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-bootstrap/pom.xml b/nifi/nifi-bootstrap/pom.xml
index 489f491..c01c95e 100644
--- a/nifi/nifi-bootstrap/pom.xml
+++ b/nifi/nifi-bootstrap/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-bootstrap</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
index de4fc93..1b1e383 100644
--- a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-data-provenance-utils</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-expression-language/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-expression-language/pom.xml b/nifi/nifi-commons/nifi-expression-language/pom.xml
index e27f5b1..18aad85 100644
--- a/nifi/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi/nifi-commons/nifi-expression-language/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-expression-language</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
index a1288e9..a677f27 100644
--- a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-flowfile-packager</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
index bcd489e..b7a72f2 100644
--- a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
+++ b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
@@ -13,14 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hl7-query-language</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-logging-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-logging-utils/pom.xml b/nifi/nifi-commons/nifi-logging-utils/pom.xml
index ea7cff9..2c86870 100644
--- a/nifi/nifi-commons/nifi-logging-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-logging-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-logging-utils</artifactId>
<description>Utilities for logging</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-processor-utilities/pom.xml b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
index 8034e82..d19b40f 100644
--- a/nifi/nifi-commons/nifi-processor-utilities/pom.xml
+++ b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-processor-utils</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-properties/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-properties/pom.xml b/nifi/nifi-commons/nifi-properties/pom.xml
index 5f6853a..7524085 100644
--- a/nifi/nifi-commons/nifi-properties/pom.xml
+++ b/nifi/nifi-commons/nifi-properties/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-properties</artifactId>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-security-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-security-utils/pom.xml b/nifi/nifi-commons/nifi-security-utils/pom.xml
index 91912a5..b4d3952 100644
--- a/nifi/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-security-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-security-utils</artifactId>
<description>Contains security functionality.</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
index c024be6..57843d0 100644
--- a/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
+++ b/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-site-to-site-client</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-client-dto</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-socket-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/pom.xml b/nifi/nifi-commons/nifi-socket-utils/pom.xml
index 49bede84..7eee6a2 100644
--- a/nifi/nifi-commons/nifi-socket-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-socket-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-socket-utils</artifactId>
<description>Utilities for socket communication</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-utils/pom.xml b/nifi/nifi-commons/nifi-utils/pom.xml
index 3474786..3abc3fd 100644
--- a/nifi/nifi-commons/nifi-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-utils/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<packaging>jar</packaging>
<!--
This project intentionally has no additional dependencies beyond that pulled in by the parent. It is a general purpose utility library
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-web-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-web-utils/pom.xml b/nifi/nifi-commons/nifi-web-utils/pom.xml
index 056789b..4f65929 100644
--- a/nifi/nifi-commons/nifi-web-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-web-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-web-utils</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
index 528a211..7393e85 100644
--- a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
+++ b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-write-ahead-log</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-commons/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/pom.xml b/nifi/nifi-commons/pom.xml
index 1d2ce46..8eeeaf1 100644
--- a/nifi/nifi-commons/pom.xml
+++ b/nifi/nifi-commons/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/pom.xml b/nifi/nifi-docs/pom.xml
index f724e96..b68ac5e 100644
--- a/nifi/nifi-docs/pom.xml
+++ b/nifi/nifi-docs/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<packaging>pom</packaging>
<artifactId>nifi-docs</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-external/nifi-spark-receiver/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/nifi-spark-receiver/pom.xml b/nifi/nifi-external/nifi-spark-receiver/pom.xml
index a6d9378..5d4cffa 100644
--- a/nifi/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi/nifi-external/nifi-spark-receiver/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-external</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-spark-receiver</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-external/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/pom.xml b/nifi/nifi-external/pom.xml
index 4fb2b39..2f121d2 100644
--- a/nifi/nifi-external/pom.xml
+++ b/nifi/nifi-external/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-external</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
index e1dd590..5cf6e5c 100644
--- a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
+++ b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-maven-archetypes</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-processor-bundle-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/pom.xml b/nifi/nifi-maven-archetypes/pom.xml
index 25a2f74..1ffcd13 100644
--- a/nifi/nifi-maven-archetypes/pom.xml
+++ b/nifi/nifi-maven-archetypes/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-maven-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-mock/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/pom.xml b/nifi/nifi-mock/pom.xml
index a070eb2..474ab2d 100644
--- a/nifi/nifi-mock/pom.xml
+++ b/nifi/nifi-mock/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-mock</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
index 3e6f450..28de272 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-aws-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>nifi-aws-nar</artifactId>
- <packaging>nar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-aws-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-aws-bundle</artifactId>
+ <version>0.1.0-incubating</version>
+ </parent>
+
+ <artifactId>nifi-aws-nar</artifactId>
+ <packaging>nar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-aws-processors</artifactId>
+ <version>0.1.0-incubating</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
index fdc8718..7975dff 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-aws-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>nifi-aws-processors</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-processor-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-mock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/test/resources/hello.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-aws-bundle</artifactId>
+ <version>0.1.0-incubating</version>
+ </parent>
+
+ <artifactId>nifi-aws-processors</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-processor-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/hello.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 4435327..175ce25 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
- </parent>
-
- <artifactId>nifi-aws-bundle</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>nifi-aws-processors</module>
- <module>nifi-aws-nar</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.9.24</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-nar-bundles</artifactId>
+ <version>0.1.0-incubating</version>
+ </parent>
+
+ <artifactId>nifi-aws-bundle</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>nifi-aws-processors</module>
+ <module>nifi-aws-nar</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.9.24</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
index d3b231f..7a959b0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
index f474aab..5b12057 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-administration</artifactId>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/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 5499795..409eb81 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
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-client-dto</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
index 1dad019..be9b26b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-cluster-authorization-provider</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
index 5995f5c..e94a857 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
@@ -1,41 +1,39 @@
-<?xml version="1.0"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <!-- 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. -->
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>nifi-documentation</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-nar-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-properties</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-processor-utils</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <!-- 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. -->
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-framework</artifactId>
+ <version>0.1.0-incubating</version>
+ </parent>
+ <artifactId>nifi-documentation</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-nar-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-properties</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-processor-utils</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
index b5cde8d..027629e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-file-authorization-provider</artifactId>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
index 064c7fb..0164e04 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework-cluster-protocol</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
index 70dcc81..06f0cac 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework-cluster-web</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
index bdff00f..bdeba34 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework-cluster</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
index 63c07c0..8ee1408 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework-core-api</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
index 25c396f..cfe4721 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
index c4a1255..25e39f9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-nar-utils</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index f9e70fb..2747248 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-resources</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
index 0406ed6..4361505 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-runtime</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
index 0fa7c0d..c8611bd 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-security</artifactId>
<description>Contains security functionality common to NiFi.</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
index 173e2cf..a6f2527 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-site-to-site</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
index 8771ab9..caffcd8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-user-actions</artifactId>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
index 75aa4ff..864adf5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-custom-ui-utilities</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index 4db9637..acda853 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-jetty</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
index 3281df7..5e75a06 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-ui-extension</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/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 20afb61..9c47c8f 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
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index c5c12d3..9591562 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-access</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index da64d4f..403a12c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-viewer</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
index 2aadb03..28a4c2a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-docs</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
index d404ba1..ec4310d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-error</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
index a9f0c3e..f0cc68f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-optimistic-locking</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
index e14cf65..bba2e5c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index d3af86e..2c5cd79 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-web-ui</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
index d9098f3..ac489e7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-web</artifactId>
<packaging>pom</packaging>
@@ -40,31 +40,31 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-api</artifactId>
<type>war</type>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-error</artifactId>
<type>war</type>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-docs</artifactId>
<type>war</type>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-viewer</artifactId>
<type>war</type>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-ui</artifactId>
<type>war</type>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
index c0b4ab9..2a63e68 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 28fb24c..4d9d981 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-framework-bundle</artifactId>
<packaging>pom</packaging>
@@ -31,92 +31,92 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster-protocol</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster-web</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-file-authorization-provider</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cluster-authorization-provider</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-client-dto</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-access</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core-api</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-user-actions</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-administration</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-optimistic-locking</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-security</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-documentation</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
index 484e291..aa53713 100644
--- a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-geo-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
index 67bc253..c9fd4df 100644
--- a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-geo-processors</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
index 2dbd32f..b6af31f 100644
--- a/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-geo-bundle</artifactId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
index ca246b3..f3bfc08 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hadoop-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
index ede32ab..135bd08 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hdfs-processors</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
index 41edf61..9023400 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hadoop-bundle</artifactId>
<packaging>pom</packaging>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hdfs-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
index 24c6101..7f446df 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hadoop-libraries-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
index 4e25bee..1c68e48 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
index 391206e..58018af 100644
--- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hl7-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
[24/54] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4d8a14ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4d8a14ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4d8a14ae
Branch: refs/heads/master
Commit: 4d8a14ae97849fc089044d5e9689f2f02559e696
Parents: c212887 684ed8e
Author: Mark Payne <ma...@hotmail.com>
Authored: Sun May 3 20:01:56 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun May 3 20:01:56 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 b080fc6..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
@@ -69,14 +69,23 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import com.sun.jersey.api.core.ResourceContext;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import 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.
*/
@Path("/cluster")
+@Api(
+ value = "/cluster",
+ description = "Provides access to the cluster of Nodes that comprise this NiFi"
+)
public class ClusterResource extends ApplicationResource {
@Context
@@ -90,6 +99,10 @@ public class ClusterResource extends ApplicationResource {
* @return node resource
*/
@Path("/nodes")
+ @ApiOperation(
+ value = "Gets the node resource",
+ response = NodeResource.class
+ )
public NodeResource getNodeResource() {
return resourceContext.getResource(NodeResource.class);
}
@@ -101,11 +114,33 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterStatusEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterStatusEntity.class)
- public Response getClusterStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets the status of the cluster",
+ response = ClusterStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getClusterStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
if (properties.isClusterManager()) {
@@ -134,7 +169,8 @@ public class ClusterResource extends ApplicationResource {
* @return An OK response with an empty entity body.
*/
@HEAD
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Response getClusterHead() {
if (properties.isClusterManager()) {
return Response.ok().build();
@@ -150,10 +186,33 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterEntity.class)
- public Response getCluster(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets the contents of the cluster",
+ notes = "Returns the contents of the cluster including all nodes and their status.",
+ response = ClusterEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getCluster(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
if (properties.isClusterManager()) {
@@ -182,11 +241,34 @@ public class ClusterResource extends ApplicationResource {
* @return Nodes that match the specified criteria
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/search-results")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterSearchResultsEntity.class)
- public Response searchCluster(@QueryParam("q") @DefaultValue(StringUtils.EMPTY) String value) {
+ @ApiOperation(
+ value = "Searches the cluster for a node with the specified address",
+ response = ClusterSearchResultsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response searchCluster(
+ @ApiParam(
+ value = "Node address to search for.",
+ required = true
+ )
+ @QueryParam("q") @DefaultValue(StringUtils.EMPTY) String value) {
// ensure this is the cluster manager
if (properties.isClusterManager()) {
@@ -233,11 +315,40 @@ public class ClusterResource extends ApplicationResource {
* @return A processorEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/processors/{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ProcessorEntity.class)
- public Response getProcessor(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets the specified processor",
+ response = ProcessorEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessor(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
+ @PathParam("id") String id) {
+
if (!properties.isClusterManager()) {
final ProcessorDTO dto = serviceFacade.getProcessor(id);
@@ -270,10 +381,9 @@ public class ClusterResource extends ApplicationResource {
*/
@PUT
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @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,
@@ -321,13 +431,38 @@ public class ClusterResource extends ApplicationResource {
*/
@PUT
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateProcessor(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
@PathParam("id") final String processorId,
+ @ApiParam(
+ value = "The processor configuration details. The only configuration that will be honored at this endpoint is the processor annontation data.",
+ required = true
+ )
final ProcessorEntity processorEntity) {
if (!properties.isClusterManager()) {
@@ -392,11 +527,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterProcessorStatusEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/processors/{id}/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterProcessorStatusEntity.class)
- public Response getProcessorStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets the processor status across the cluster",
+ response = ClusterProcessorStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessorStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The processor id",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
@@ -426,11 +589,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterProcessorStatusHistoryEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/processors/{id}/status/history")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterStatusHistoryEntity.class)
- public Response getProcessorStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets processor status history across the cluster",
+ response = ClusterStatusHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessorStatusHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The processor id",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
final ClusterStatusHistoryDTO dto = serviceFacade.getClusterProcessorStatusHistory(id);
@@ -459,11 +650,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterProcessorStatusEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/connections/{id}/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterConnectionStatusEntity.class)
- public Response getConnectionStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets connection status across the cluster",
+ response = ClusterConnectionStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getConnectionStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The connection id",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
@@ -493,11 +712,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterProcessorStatusHistoryEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/connections/{id}/status/history")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterStatusHistoryEntity.class)
- public Response getConnectionStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets connection status history across the cluster",
+ response = ClusterStatusHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getConnectionStatusHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The connection id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
final ClusterStatusHistoryDTO dto = serviceFacade.getClusterConnectionStatusHistory(id);
@@ -526,11 +773,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterProcessGroupStatusEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/process-groups/{id}/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterConnectionStatusEntity.class)
- public Response getProcessGroupStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets process group status across the cluster",
+ response = ClusterProcessGroupStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessGroupStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The process group id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
@@ -560,11 +835,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterProcessGroupStatusHistoryEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/process-groups/{id}/status/history")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterStatusHistoryEntity.class)
- public Response getProcessGroupStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets process group status history across the cluster",
+ response = ClusterStatusHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessGroupStatusHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The process group id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
final ClusterStatusHistoryDTO dto = serviceFacade.getClusterProcessGroupStatusHistory(id);
@@ -593,11 +896,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterRemoteProcessGroupStatusEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/remote-process-groups/{id}/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterRemoteProcessGroupStatusEntity.class)
- public Response getRemoteProcessGroupStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets remote process group status across the cluster",
+ response = ClusterRemoteProcessGroupStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getRemoteProcessGroupStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The remote process group id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
@@ -627,11 +958,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterPortStatusEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/input-ports/{id}/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterPortStatusEntity.class)
- public Response getInputPortStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets input port status across the cluster",
+ response = ClusterPortStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getInputPortStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The input port id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
@@ -661,11 +1020,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterPortStatusEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
@Path("/output-ports/{id}/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ClusterPortStatusEntity.class)
- public Response getOutputPortStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets output port status across the cluster",
+ response = ClusterPortStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getOutputPortStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The output port id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
@@ -695,11 +1082,39 @@ public class ClusterResource extends ApplicationResource {
* @return A clusterRemoteProcessGroupStatusHistoryEntity
*/
@GET
- @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes(MediaType.WILDCARD)
+ @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)
- public Response getRemoteProcessGroupStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets the remote process group status history across the cluster",
+ response = ClusterStatusHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "DFM", type = "ROLE_DFM"),
+ @Authorization(value = "Admin", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getRemoteProcessGroupStatusHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The remote process group id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
final ClusterStatusHistoryDTO dto = serviceFacade.getClusterRemoteProcessGroupStatusHistory(id);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 137cc07..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
@@ -65,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;
@@ -73,6 +78,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Connection.
*/
+@Api(hidden = true)
public class ConnectionResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(ConnectionResource.class);
@@ -111,10 +117,34 @@ public class ConnectionResource extends ApplicationResource {
* @return A connectionsEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getConnections(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets all connections",
+ response = ConnectionsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getConnections(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -145,11 +175,38 @@ public class ConnectionResource extends ApplicationResource {
* @return A connectionEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ConnectionEntity.class)
- public Response getConnection(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiOperation(
+ value = "Gets a connection",
+ response = ConnectionEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getConnection(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The connection id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -181,11 +238,39 @@ public class ConnectionResource extends ApplicationResource {
* @return A statusHistoryEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}/status/history")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(StatusHistoryEntity.class)
- public Response getConnectionStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets the status history for a connection",
+ response = StatusHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getConnectionStatusHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The connection id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -234,8 +319,8 @@ public class ConnectionResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -368,10 +453,30 @@ public class ConnectionResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createConnection(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The connection configuration details.",
+ required = true
+ )
ConnectionEntity connectionEntity) {
if (connectionEntity == null || connectionEntity.getConnection() == null) {
@@ -474,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,
@@ -612,11 +716,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateConnection(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The connection id.",
+ required = true
+ )
@PathParam("id") String id,
- ConnectionEntity connectionEntity) {
+ @ApiParam(
+ value = "The connection configuration details.",
+ required = true
+ ) ConnectionEntity connectionEntity) {
if (connectionEntity == null || connectionEntity.getConnection() == null) {
throw new IllegalArgumentException("Connection details must be specified.");
@@ -680,14 +806,42 @@ public class ConnectionResource extends ApplicationResource {
* @return An Entity containing the client id and an updated revision.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}")
@PreAuthorize("hasRole('ROLE_DFM')")
- @TypeHint(ConnectionEntity.class)
+ @ApiOperation(
+ value = "Deletes a connection",
+ response = ConnectionEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response deleteRelationshipTarget(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The connection id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
[13/54] [abbrv] incubator-nifi git commit: NIFI-557 fixed the correct
test and removed extraneous/duplicative ones - build now works
Posted by ma...@apache.org.
NIFI-557 fixed the correct test and removed extraneous/duplicative ones - build now works
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/7853e3c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7853e3c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7853e3c1
Branch: refs/heads/master
Commit: 7853e3c165bbbf0d4c3bcb116bd9d9512f5e3578
Parents: 997ed94
Author: joewitt <jo...@apache.org>
Authored: Fri May 1 16:17:25 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Sat May 2 16:03:28 2015 -0400
----------------------------------------------------------------------
.../impl/SocketProtocolListenerTest.java | 133 ++++++++++++
.../ClusterManagerProtocolSenderImplTest.java | 144 -------------
.../impl/ClusterServiceLocatorTest.java | 121 -----------
.../impl/ClusterServicesBroadcasterTest.java | 132 ------------
.../impl/MulticastProtocolListenerTest.java | 171 ----------------
.../impl/NodeProtocolSenderImplTest.java | 202 -------------------
.../impl/SocketProtocolListenerTest.java | 133 ------------
.../testutils/DelayedProtocolHandler.java | 57 ------
.../testutils/ReflexiveProtocolHandler.java | 47 -----
9 files changed, 133 insertions(+), 1007 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
new file mode 100644
index 0000000..7a91c29
--- /dev/null
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.cluster.protocol.impl;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import org.apache.nifi.cluster.protocol.ProtocolContext;
+import org.apache.nifi.cluster.protocol.ProtocolMessageMarshaller;
+import org.apache.nifi.cluster.protocol.ProtocolMessageUnmarshaller;
+import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
+import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
+import org.apache.nifi.cluster.protocol.message.PingMessage;
+import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
+import org.apache.nifi.cluster.protocol.testutils.DelayedProtocolHandler;
+import org.apache.nifi.cluster.protocol.testutils.ReflexiveProtocolHandler;
+import org.apache.nifi.io.socket.ServerSocketConfiguration;
+import org.apache.nifi.io.socket.SocketConfiguration;
+import org.apache.nifi.io.socket.SocketUtils;
+import org.junit.After;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author unattributed
+ */
+public class SocketProtocolListenerTest {
+
+ private SocketProtocolListener listener;
+
+ private Socket socket;
+
+ private ProtocolMessageMarshaller<ProtocolMessage> marshaller;
+
+ private ProtocolMessageUnmarshaller<ProtocolMessage> unmarshaller;
+
+ @Before
+ public void setup() throws Exception {
+
+ final ProtocolContext protocolContext = new JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
+ marshaller = protocolContext.createMarshaller();
+ unmarshaller = protocolContext.createUnmarshaller();
+
+ ServerSocketConfiguration configuration = new ServerSocketConfiguration();
+ configuration.setSocketTimeout(1000);
+
+ listener = new SocketProtocolListener(5, 0, configuration, protocolContext);
+ listener.start();
+
+ int port = listener.getPort();
+
+ SocketConfiguration config = new SocketConfiguration();
+ config.setReuseAddress(true);
+ config.setSocketTimeout(1000);
+ socket = SocketUtils.createSocket(new InetSocketAddress("localhost", port), config);
+ }
+
+ @After
+ public void teardown() throws IOException {
+ try {
+ if (listener.isRunning()) {
+ listener.stop();
+ }
+ } finally {
+ SocketUtils.closeQuietly(socket);
+ }
+ }
+
+ @Test
+ public void testBadRequest() throws Exception {
+ DelayedProtocolHandler handler = new DelayedProtocolHandler(0);
+ listener.addHandler(handler);
+ socket.getOutputStream().write(5);
+ Thread.sleep(250);
+ assertEquals(0, handler.getMessages().size());
+ }
+
+ @Test
+ public void testRequest() throws Exception {
+ ProtocolMessage msg = new PingMessage();
+
+ ReflexiveProtocolHandler handler = new ReflexiveProtocolHandler();
+ listener.addHandler(handler);
+
+ // marshal message to output stream
+ marshaller.marshal(msg, socket.getOutputStream());
+
+ // unmarshall response and return
+ ProtocolMessage response = unmarshaller.unmarshal(socket.getInputStream());
+ assertEquals(msg.getType(), response.getType());
+
+ assertEquals(1, handler.getMessages().size());
+ assertEquals(msg.getType(), handler.getMessages().get(0).getType());
+ }
+
+ @Test
+ public void testDelayedRequest() throws Exception {
+ ProtocolMessage msg = new PingMessage();
+
+ DelayedProtocolHandler handler = new DelayedProtocolHandler(2000);
+ listener.addHandler(handler);
+
+ // marshal message to output stream
+ marshaller.marshal(msg, socket.getOutputStream());
+
+ try {
+ socket.getInputStream().read();
+ fail("Socket timeout not received.");
+ } catch (SocketTimeoutException ste) {
+ }
+
+ assertEquals(1, handler.getMessages().size());
+ assertEquals(msg.getType(), handler.getMessages().get(0).getType());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
deleted file mode 100644
index 9e4237f..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
+++ /dev/null
@@ -1,144 +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.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import java.io.IOException;
-import java.net.InetAddress;
-
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.FlowRequestMessage;
-import org.apache.nifi.cluster.protocol.message.FlowResponseMessage;
-import org.apache.nifi.cluster.protocol.message.PingMessage;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.io.socket.ServerSocketConfiguration;
-import org.apache.nifi.io.socket.SocketConfiguration;
-import org.junit.After;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-/**
- * @author unattributed
- */
-public class ClusterManagerProtocolSenderImplTest {
-
- private InetAddress address;
-
- private int port;
-
- private SocketProtocolListener listener;
-
- private ClusterManagerProtocolSenderImpl sender;
-
- private ProtocolHandler mockHandler;
-
- @Before
- public void setup() throws IOException, InterruptedException {
-
- address = InetAddress.getLocalHost();
- final ServerSocketConfiguration serverSocketConfiguration = new ServerSocketConfiguration();
-
- mockHandler = mock(ProtocolHandler.class);
-
- final ProtocolContext protocolContext = new JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
-
- listener = new SocketProtocolListener(5, 0, serverSocketConfiguration, protocolContext);
- listener.addHandler(mockHandler);
- listener.start();
-
- // Need to be sure that we give the listener plenty of time to startup. Otherwise, we get intermittent
- // test failures because the Thread started by listener.start() isn't ready to accept connections
- // before we make them.
- Thread.sleep(1000L);
-
- port = listener.getPort();
-
- final SocketConfiguration socketConfiguration = new SocketConfiguration();
- sender = new ClusterManagerProtocolSenderImpl(socketConfiguration, protocolContext);
- }
-
- @After
- public void teardown() throws IOException {
- if (listener.isRunning()) {
- listener.stop();
- }
- }
-
- @Test
- public void testRequestFlow() throws Exception {
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(new FlowResponseMessage());
- final FlowRequestMessage request = new FlowRequestMessage();
- request.setNodeId(new NodeIdentifier("id", "api-address", 1, "localhost", port));
- final FlowResponseMessage response = sender.requestFlow(request);
- assertNotNull(response);
- }
-
- @Test
- public void testRequestFlowWithBadResponseMessage() throws Exception {
-
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(new PingMessage());
- final FlowRequestMessage request = new FlowRequestMessage();
- request.setNodeId(new NodeIdentifier("id", "api-address", 1, "localhost", port));
- try {
- sender.requestFlow(request);
- fail("failed to throw exception");
- } catch (final ProtocolException pe) {
- }
-
- }
-
- @Test
- public void testRequestFlowDelayedResponse() throws Exception {
-
- final int time = 250;
- sender.getSocketConfiguration().setSocketTimeout(time);
-
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenAnswer(new Answer<FlowResponseMessage>() {
- @Override
- public FlowResponseMessage answer(final InvocationOnMock invocation) throws Throwable {
- Thread.sleep(time * 3);
- return new FlowResponseMessage();
- }
- });
- final FlowRequestMessage request = new FlowRequestMessage();
- request.setNodeId(new NodeIdentifier("id", "api-address", 1, "localhost", port));
- try {
- sender.requestFlow(request);
- fail("failed to throw exception");
- } catch (final ProtocolException pe) {
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
deleted file mode 100644
index ea40150..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocatorTest.java
+++ /dev/null
@@ -1,121 +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.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import java.net.InetSocketAddress;
-import java.util.concurrent.TimeUnit;
-import org.apache.nifi.io.socket.multicast.DiscoverableService;
-import org.apache.nifi.io.socket.multicast.DiscoverableServiceImpl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import org.junit.Before;
-import org.junit.Test;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import org.mockito.stubbing.OngoingStubbing;
-
-public class ClusterServiceLocatorTest {
-
- private ClusterServiceDiscovery mockServiceDiscovery;
-
- private int fixedPort;
-
- private DiscoverableService fixedService;
-
- private ClusterServiceLocator serviceDiscoveryLocator;
-
- private ClusterServiceLocator serviceDiscoveryFixedPortLocator;
-
- private ClusterServiceLocator fixedServiceLocator;
-
- @Before
- public void setup() throws Exception {
-
- fixedPort = 1;
- mockServiceDiscovery = mock(ClusterServiceDiscovery.class);
- fixedService = new DiscoverableServiceImpl("some-service", InetSocketAddress.createUnresolved("some-host", 20));
-
- serviceDiscoveryLocator = new ClusterServiceLocator(mockServiceDiscovery);
- serviceDiscoveryFixedPortLocator = new ClusterServiceLocator(mockServiceDiscovery, fixedPort);
- fixedServiceLocator = new ClusterServiceLocator(fixedService);
-
- }
-
- @Test
- public void getServiceWhenServiceDiscoveryNotStarted() {
- assertNull(serviceDiscoveryLocator.getService());
- }
-
- @Test
- public void getServiceWhenServiceDiscoveryFixedPortNotStarted() {
- assertNull(serviceDiscoveryLocator.getService());
- }
-
- @Test
- public void getServiceWhenFixedServiceNotStarted() {
- assertEquals(fixedService, fixedServiceLocator.getService());
- }
-
- @Test
- public void getServiceNotOnFirstAttempt() {
-
- ClusterServiceLocator.AttemptsConfig config = new ClusterServiceLocator.AttemptsConfig();
- config.setNumAttempts(2);
- config.setTimeBetweenAttempsUnit(TimeUnit.SECONDS);
- config.setTimeBetweenAttempts(1);
-
- serviceDiscoveryLocator.setAttemptsConfig(config);
-
- OngoingStubbing<DiscoverableService> stubbing = null;
- for (int i = 0; i < config.getNumAttempts() - 1; i++) {
- if (stubbing == null) {
- stubbing = when(mockServiceDiscovery.getService()).thenReturn(null);
- } else {
- stubbing.thenReturn(null);
- }
- }
- stubbing.thenReturn(fixedService);
-
- assertEquals(fixedService, serviceDiscoveryLocator.getService());
-
- }
-
- @Test
- public void getServiceNotOnFirstAttemptWithFixedPort() {
-
- ClusterServiceLocator.AttemptsConfig config = new ClusterServiceLocator.AttemptsConfig();
- config.setNumAttempts(2);
- config.setTimeBetweenAttempsUnit(TimeUnit.SECONDS);
- config.setTimeBetweenAttempts(1);
-
- serviceDiscoveryFixedPortLocator.setAttemptsConfig(config);
-
- OngoingStubbing<DiscoverableService> stubbing = null;
- for (int i = 0; i < config.getNumAttempts() - 1; i++) {
- if (stubbing == null) {
- stubbing = when(mockServiceDiscovery.getService()).thenReturn(null);
- } else {
- stubbing.thenReturn(null);
- }
- }
- stubbing.thenReturn(fixedService);
-
- InetSocketAddress resultAddress = InetSocketAddress.createUnresolved(fixedService.getServiceAddress().getHostName(), fixedPort);
- DiscoverableService resultService = new DiscoverableServiceImpl(fixedService.getServiceName(), resultAddress);
- assertEquals(resultService, serviceDiscoveryFixedPortLocator.getService());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
deleted file mode 100644
index 0f834fc..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
+++ /dev/null
@@ -1,132 +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.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import java.net.InetSocketAddress;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.ServiceBroadcastMessage;
-import org.apache.nifi.io.socket.multicast.DiscoverableService;
-import org.apache.nifi.io.socket.multicast.DiscoverableServiceImpl;
-import org.apache.nifi.io.socket.multicast.MulticastConfiguration;
-import org.junit.After;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author unattributed
- */
-public class ClusterServicesBroadcasterTest {
-
- private ClusterServicesBroadcaster broadcaster;
-
- private MulticastProtocolListener listener;
-
- private DummyProtocolHandler handler;
-
- private InetSocketAddress multicastAddress;
-
- private DiscoverableService broadcastedService;
-
- private ProtocolContext protocolContext;
-
- private MulticastConfiguration configuration;
-
- @Before
- public void setup() throws Exception {
-
- broadcastedService = new DiscoverableServiceImpl("some-service", new InetSocketAddress("localhost", 11111));
-
- multicastAddress = new InetSocketAddress("225.1.1.1", 22222);
-
- configuration = new MulticastConfiguration();
-
- protocolContext = new JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
-
- broadcaster = new ClusterServicesBroadcaster(multicastAddress, configuration, protocolContext, "500 ms");
- broadcaster.addService(broadcastedService);
-
- handler = new DummyProtocolHandler();
- listener = new MulticastProtocolListener(5, multicastAddress, configuration, protocolContext);
- listener.addHandler(handler);
- }
-
- @After
- public void teardown() {
-
- if (broadcaster.isRunning()) {
- broadcaster.stop();
- }
-
- try {
- if (listener.isRunning()) {
- listener.stop();
- }
- } catch (Exception ex) {
- ex.printStackTrace(System.out);
- }
-
- }
-
- @Test
- @Ignore
- public void testBroadcastReceived() throws Exception {
-
- broadcaster.start();
- listener.start();
-
- Thread.sleep(1000);
-
- listener.stop();
-
- assertNotNull(handler.getProtocolMessage());
- assertEquals(ProtocolMessage.MessageType.SERVICE_BROADCAST, handler.getProtocolMessage().getType());
- final ServiceBroadcastMessage msg = (ServiceBroadcastMessage) handler.getProtocolMessage();
- assertEquals(broadcastedService.getServiceName(), msg.getServiceName());
- assertEquals(broadcastedService.getServiceAddress().getHostName(), msg.getAddress());
- assertEquals(broadcastedService.getServiceAddress().getPort(), msg.getPort());
- }
-
- private class DummyProtocolHandler implements ProtocolHandler {
-
- private ProtocolMessage protocolMessage;
-
- @Override
- public boolean canHandle(ProtocolMessage msg) {
- return true;
- }
-
- @Override
- public ProtocolMessage handle(ProtocolMessage msg) throws ProtocolException {
- this.protocolMessage = msg;
- return null;
- }
-
- public ProtocolMessage getProtocolMessage() {
- return protocolMessage;
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
deleted file mode 100644
index f5037a8..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java
+++ /dev/null
@@ -1,171 +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.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.InetSocketAddress;
-import java.net.MulticastSocket;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.ProtocolMessageMarshaller;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.MulticastProtocolMessage;
-import org.apache.nifi.cluster.protocol.message.PingMessage;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.io.socket.multicast.MulticastConfiguration;
-import org.apache.nifi.io.socket.multicast.MulticastUtils;
-import org.junit.After;
-import static org.junit.Assert.assertEquals;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * @author unattributed
- */
-public class MulticastProtocolListenerTest {
-
- private MulticastProtocolListener listener;
-
- private MulticastSocket socket;
-
- private InetSocketAddress address;
-
- private MulticastConfiguration configuration;
-
- private ProtocolContext protocolContext;
-
- @Before
- public void setup() throws Exception {
-
- address = new InetSocketAddress("226.1.1.1", 60000);
- configuration = new MulticastConfiguration();
-
- protocolContext = new JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
-
- listener = new MulticastProtocolListener(5, address, configuration, protocolContext);
- listener.start();
-
- socket = MulticastUtils.createMulticastSocket(address.getPort(), configuration);
- }
-
- @After
- public void teardown() throws IOException {
- try {
- if (listener.isRunning()) {
- listener.stop();
- }
- } finally {
- MulticastUtils.closeQuietly(socket);
- }
- }
-
- @Ignore("This test must be reworked. Requires an active network connection")
- @Test
- public void testBadRequest() throws Exception {
- DelayedProtocolHandler handler = new DelayedProtocolHandler(0);
- listener.addHandler(handler);
- DatagramPacket packet = new DatagramPacket(new byte[]{5}, 1, address);
- socket.send(packet);
- Thread.sleep(250);
- assertEquals(0, handler.getMessages().size());
- }
-
- @Test
- @Ignore
- public void testRequest() throws Exception {
-
- ReflexiveProtocolHandler handler = new ReflexiveProtocolHandler();
- listener.addHandler(handler);
-
- ProtocolMessage msg = new PingMessage();
- MulticastProtocolMessage multicastMsg = new MulticastProtocolMessage("some-id", msg);
-
- // marshal message to output stream
- ProtocolMessageMarshaller marshaller = protocolContext.createMarshaller();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- marshaller.marshal(multicastMsg, baos);
- byte[] requestPacketBytes = baos.toByteArray();
- DatagramPacket packet = new DatagramPacket(requestPacketBytes, requestPacketBytes.length, address);
- socket.send(packet);
-
- Thread.sleep(250);
- assertEquals(1, handler.getMessages().size());
- assertEquals(msg.getType(), handler.getMessages().get(0).getType());
-
- }
-
- private class ReflexiveProtocolHandler implements ProtocolHandler {
-
- private List<ProtocolMessage> messages = new ArrayList<>();
-
- @Override
- public ProtocolMessage handle(ProtocolMessage msg) throws ProtocolException {
- messages.add(msg);
- return msg;
- }
-
- @Override
- public boolean canHandle(ProtocolMessage msg) {
- return true;
- }
-
- public List<ProtocolMessage> getMessages() {
- return messages;
- }
-
- }
-
- private class DelayedProtocolHandler implements ProtocolHandler {
-
- private int delay = 0;
-
- private List<ProtocolMessage> messages = new ArrayList<>();
-
- public DelayedProtocolHandler(int delay) {
- this.delay = delay;
- }
-
- @Override
- public ProtocolMessage handle(ProtocolMessage msg) throws ProtocolException {
- try {
- messages.add(msg);
- Thread.sleep(delay);
- return null;
- } catch (final InterruptedException ie) {
- throw new ProtocolException(ie);
- }
-
- }
-
- @Override
- public boolean canHandle(ProtocolMessage msg) {
- return true;
- }
-
- public List<ProtocolMessage> getMessages() {
- return messages;
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
deleted file mode 100644
index a759b86..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/NodeProtocolSenderImplTest.java
+++ /dev/null
@@ -1,202 +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.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.UUID;
-
-import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.protocol.ConnectionRequest;
-import org.apache.nifi.cluster.protocol.ConnectionResponse;
-import org.apache.nifi.cluster.protocol.Heartbeat;
-import org.apache.nifi.cluster.protocol.NodeIdentifier;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.StandardDataFlow;
-import org.apache.nifi.cluster.protocol.UnknownServiceAddressException;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.ConnectionRequestMessage;
-import org.apache.nifi.cluster.protocol.message.ConnectionResponseMessage;
-import org.apache.nifi.cluster.protocol.message.ControllerStartupFailureMessage;
-import org.apache.nifi.cluster.protocol.message.HeartbeatMessage;
-import org.apache.nifi.cluster.protocol.message.PingMessage;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.io.socket.ServerSocketConfiguration;
-import org.apache.nifi.io.socket.SocketConfiguration;
-import org.apache.nifi.io.socket.multicast.DiscoverableService;
-import org.apache.nifi.io.socket.multicast.DiscoverableServiceImpl;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-/**
- * @author unattributed
- */
-public class NodeProtocolSenderImplTest {
-
- private SocketProtocolListener listener;
-
- private NodeProtocolSenderImpl sender;
-
- private DiscoverableService service;
-
- private ServerSocketConfiguration serverSocketConfiguration;
-
- private ClusterServiceLocator mockServiceLocator;
-
- private ProtocolHandler mockHandler;
-
- private NodeIdentifier nodeIdentifier;
-
- @Before
- public void setup() throws IOException {
-
- serverSocketConfiguration = new ServerSocketConfiguration();
-
- mockServiceLocator = mock(ClusterServiceLocator.class);
- mockHandler = mock(ProtocolHandler.class);
-
- nodeIdentifier = new NodeIdentifier("1", "localhost", 1234, "localhost", 5678);
-
- ProtocolContext protocolContext = new JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
-
- listener = new SocketProtocolListener(5, 0, serverSocketConfiguration, protocolContext);
- listener.setShutdownListenerSeconds(3);
- listener.addHandler(mockHandler);
- listener.start();
-
- service = new DiscoverableServiceImpl("some-service", new InetSocketAddress("localhost", listener.getPort()));
-
- SocketConfiguration socketConfiguration = new SocketConfiguration();
- socketConfiguration.setReuseAddress(true);
- sender = new NodeProtocolSenderImpl(mockServiceLocator, socketConfiguration, protocolContext);
- }
-
- @After
- public void teardown() throws IOException {
- if (listener.isRunning()) {
- listener.stop();
- }
- }
-
- @Test
- public void testConnect() throws Exception {
-
- when(mockServiceLocator.getService()).thenReturn(service);
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- ConnectionResponseMessage mockMessage = new ConnectionResponseMessage();
- mockMessage.setConnectionResponse(new ConnectionResponse(nodeIdentifier,
- new StandardDataFlow("flow".getBytes("UTF-8"), new byte[0], new byte[0]), false, null, null, UUID.randomUUID().toString()));
- when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(mockMessage);
-
- ConnectionRequestMessage request = new ConnectionRequestMessage();
- request.setConnectionRequest(new ConnectionRequest(nodeIdentifier));
- ConnectionResponseMessage response = sender.requestConnection(request);
- assertNotNull(response);
- }
-
- @Test(expected = UnknownServiceAddressException.class)
- public void testConnectNoClusterManagerAddress() throws Exception {
-
- when(mockServiceLocator.getService()).thenReturn(null);
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(new ConnectionResponseMessage());
-
- ConnectionRequestMessage request = new ConnectionRequestMessage();
- request.setConnectionRequest(new ConnectionRequest(nodeIdentifier));
-
- sender.requestConnection(request);
- fail("failed to throw exception");
- }
-
- @Test(expected = ProtocolException.class)
- public void testConnectBadResponse() throws Exception {
-
- when(mockServiceLocator.getService()).thenReturn(service);
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(new PingMessage());
-
- ConnectionRequestMessage request = new ConnectionRequestMessage();
- request.setConnectionRequest(new ConnectionRequest(nodeIdentifier));
-
- sender.requestConnection(request);
- fail("failed to throw exception");
-
- }
-
- @Test(expected = ProtocolException.class)
- public void testConnectDelayedResponse() throws Exception {
-
- final int time = 250;
- sender.getSocketConfiguration().setSocketTimeout(time);
- when(mockServiceLocator.getService()).thenReturn(service);
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenAnswer(new Answer<ConnectionResponseMessage>() {
- @Override
- public ConnectionResponseMessage answer(InvocationOnMock invocation) throws Throwable {
- Thread.sleep(time * 3);
- return new ConnectionResponseMessage();
- }
- });
- ConnectionRequestMessage request = new ConnectionRequestMessage();
- request.setConnectionRequest(new ConnectionRequest(nodeIdentifier));
-
- sender.requestConnection(request);
- fail("failed to throw exception");
-
- }
-
- @Test
- public void testHeartbeat() throws Exception {
-
- when(mockServiceLocator.getService()).thenReturn(service);
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(null);
-
- HeartbeatMessage msg = new HeartbeatMessage();
- HeartbeatPayload hbPayload = new HeartbeatPayload();
- Heartbeat hb = new Heartbeat(new NodeIdentifier("id", "localhost", 3, "localhost", 4), false, false, hbPayload.marshal());
- msg.setHeartbeat(hb);
- sender.heartbeat(msg);
- }
-
- @Test
- public void testNotifyControllerStartupFailure() throws Exception {
-
- when(mockServiceLocator.getService()).thenReturn(service);
- when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
- when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(null);
-
- ControllerStartupFailureMessage msg = new ControllerStartupFailureMessage();
- msg.setNodeId(new NodeIdentifier("some-id", "some-addr", 1, "some-addr", 1));
- msg.setExceptionMessage("some exception");
- sender.notifyControllerStartupFailure(msg);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
deleted file mode 100644
index 7a91c29..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
+++ /dev/null
@@ -1,133 +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.
- */
-package org.apache.nifi.cluster.protocol.impl;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import org.apache.nifi.cluster.protocol.ProtocolContext;
-import org.apache.nifi.cluster.protocol.ProtocolMessageMarshaller;
-import org.apache.nifi.cluster.protocol.ProtocolMessageUnmarshaller;
-import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
-import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
-import org.apache.nifi.cluster.protocol.message.PingMessage;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.testutils.DelayedProtocolHandler;
-import org.apache.nifi.cluster.protocol.testutils.ReflexiveProtocolHandler;
-import org.apache.nifi.io.socket.ServerSocketConfiguration;
-import org.apache.nifi.io.socket.SocketConfiguration;
-import org.apache.nifi.io.socket.SocketUtils;
-import org.junit.After;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @author unattributed
- */
-public class SocketProtocolListenerTest {
-
- private SocketProtocolListener listener;
-
- private Socket socket;
-
- private ProtocolMessageMarshaller<ProtocolMessage> marshaller;
-
- private ProtocolMessageUnmarshaller<ProtocolMessage> unmarshaller;
-
- @Before
- public void setup() throws Exception {
-
- final ProtocolContext protocolContext = new JaxbProtocolContext(JaxbProtocolUtils.JAXB_CONTEXT);
- marshaller = protocolContext.createMarshaller();
- unmarshaller = protocolContext.createUnmarshaller();
-
- ServerSocketConfiguration configuration = new ServerSocketConfiguration();
- configuration.setSocketTimeout(1000);
-
- listener = new SocketProtocolListener(5, 0, configuration, protocolContext);
- listener.start();
-
- int port = listener.getPort();
-
- SocketConfiguration config = new SocketConfiguration();
- config.setReuseAddress(true);
- config.setSocketTimeout(1000);
- socket = SocketUtils.createSocket(new InetSocketAddress("localhost", port), config);
- }
-
- @After
- public void teardown() throws IOException {
- try {
- if (listener.isRunning()) {
- listener.stop();
- }
- } finally {
- SocketUtils.closeQuietly(socket);
- }
- }
-
- @Test
- public void testBadRequest() throws Exception {
- DelayedProtocolHandler handler = new DelayedProtocolHandler(0);
- listener.addHandler(handler);
- socket.getOutputStream().write(5);
- Thread.sleep(250);
- assertEquals(0, handler.getMessages().size());
- }
-
- @Test
- public void testRequest() throws Exception {
- ProtocolMessage msg = new PingMessage();
-
- ReflexiveProtocolHandler handler = new ReflexiveProtocolHandler();
- listener.addHandler(handler);
-
- // marshal message to output stream
- marshaller.marshal(msg, socket.getOutputStream());
-
- // unmarshall response and return
- ProtocolMessage response = unmarshaller.unmarshal(socket.getInputStream());
- assertEquals(msg.getType(), response.getType());
-
- assertEquals(1, handler.getMessages().size());
- assertEquals(msg.getType(), handler.getMessages().get(0).getType());
- }
-
- @Test
- public void testDelayedRequest() throws Exception {
- ProtocolMessage msg = new PingMessage();
-
- DelayedProtocolHandler handler = new DelayedProtocolHandler(2000);
- listener.addHandler(handler);
-
- // marshal message to output stream
- marshaller.marshal(msg, socket.getOutputStream());
-
- try {
- socket.getInputStream().read();
- fail("Socket timeout not received.");
- } catch (SocketTimeoutException ste) {
- }
-
- assertEquals(1, handler.getMessages().size());
- assertEquals(msg.getType(), handler.getMessages().get(0).getType());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java
deleted file mode 100644
index 2f16777..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/DelayedProtocolHandler.java
+++ /dev/null
@@ -1,57 +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.
- */
-package org.apache.nifi.cluster.protocol.testutils;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-
-/**
- * @author unattributed
- */
-public class DelayedProtocolHandler implements ProtocolHandler {
-
- private int delay = 0;
- private List<ProtocolMessage> messages = new ArrayList<>();
-
- public DelayedProtocolHandler(int delay) {
- this.delay = delay;
- }
-
- @Override
- public ProtocolMessage handle(ProtocolMessage msg) throws ProtocolException {
- try {
- messages.add(msg);
- Thread.sleep(delay);
- return null;
- } catch (final InterruptedException ie) {
- throw new ProtocolException(ie);
- }
-
- }
-
- @Override
- public boolean canHandle(ProtocolMessage msg) {
- return true;
- }
-
- public List<ProtocolMessage> getMessages() {
- return messages;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7853e3c1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java
deleted file mode 100644
index e80f52c..0000000
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/protocol/testutils/ReflexiveProtocolHandler.java
+++ /dev/null
@@ -1,47 +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.
- */
-package org.apache.nifi.cluster.protocol.testutils;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.nifi.cluster.protocol.ProtocolException;
-import org.apache.nifi.cluster.protocol.ProtocolHandler;
-import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-
-/**
- * @author unattributed
- */
-public class ReflexiveProtocolHandler implements ProtocolHandler {
-
- private List<ProtocolMessage> messages = new ArrayList<>();
-
- @Override
- public ProtocolMessage handle(ProtocolMessage msg) throws ProtocolException {
- messages.add(msg);
- return msg;
- }
-
- @Override
- public boolean canHandle(ProtocolMessage msg) {
- return true;
- }
-
- public List<ProtocolMessage> getMessages() {
- return messages;
- }
-
-}
[34/54] [abbrv] incubator-nifi git commit: Merge branch 'NIFI-593'
into develop
Posted by ma...@apache.org.
Merge branch 'NIFI-593' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b70845b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b70845b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b70845b3
Branch: refs/heads/master
Commit: b70845b31e8ff49cfe958c53feb9752b8dac0aa7
Parents: 251f0e5 1381920
Author: Aldrin Piri <al...@apache.org>
Authored: Wed May 6 09:11:24 2015 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed May 6 09:11:24 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/util/NiFiPropertiesTest.java | 23 +++++++++++-----
.../org/apache/nifi/nar/NarUnpackerTest.java | 29 ++++++++++++--------
2 files changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[04/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 fd97dca..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -53,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;
@@ -61,6 +66,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Funnel.
*/
+@Api(hidden = true)
public class FunnelResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(FunnelResource.class);
@@ -95,14 +101,40 @@ public class FunnelResource extends ApplicationResource {
/**
* Retrieves all the of funnels in this NiFi.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @return A funnelsEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getFunnels(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets all funnels",
+ response = FunnelsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getFunnels(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -129,8 +161,11 @@ public class FunnelResource extends ApplicationResource {
* Creates a new funnel.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param x The x coordinate for this funnels position.
* @param y The y coordinate for this funnels position.
* @return A funnelEntity.
@@ -138,8 +173,8 @@ public class FunnelResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -181,11 +216,30 @@ public class FunnelResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createFunnel(
@Context HttpServletRequest httpServletRequest,
- FunnelEntity funnelEntity) {
+ @ApiParam(
+ value = "The funnel configuration details.",
+ required = true
+ ) FunnelEntity funnelEntity) {
if (funnelEntity == null || funnelEntity.getFunnel() == null) {
throw new IllegalArgumentException("Funnel details must be specified.");
@@ -254,16 +308,46 @@ public class FunnelResource extends ApplicationResource {
/**
* Retrieves the specified funnel.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the funnel to retrieve
* @return A funnelEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(FunnelEntity.class)
- public Response getFunnel(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets a funnel",
+ response = FunnelEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getFunnel(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The funnel id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -289,8 +373,11 @@ public class FunnelResource extends ApplicationResource {
* Updates the specified funnel.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the funnel to update.
* @param parentGroupId The id of the process group to move this funnel to.
* @param x The x coordinate for this funnels position.
@@ -302,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,
@@ -350,11 +436,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateFunnel(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The funnel id.",
+ required = true
+ )
@PathParam("id") String id,
- FunnelEntity funnelEntity) {
+ @ApiParam(
+ value = "The funnel configuration details.",
+ required = true
+ ) FunnelEntity funnelEntity) {
if (funnelEntity == null || funnelEntity.getFunnel() == null) {
throw new IllegalArgumentException("Funnel details must be specified.");
@@ -413,20 +521,51 @@ public class FunnelResource extends ApplicationResource {
* Removes the specified funnel.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the funnel to remove.
* @return A entity containing the client id and an updated revision.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasRole('ROLE_DFM')")
- @TypeHint(FunnelEntity.class)
+ @ApiOperation(
+ value = "Deletes a funnel",
+ response = FunnelEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeFunnel(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The funnel id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 749863c..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
@@ -16,6 +16,13 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
@@ -38,12 +45,12 @@ 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;
/**
* RESTful endpoint for querying the history of this Controller.
*/
+@Api(hidden = true)
public class HistoryResource extends ApplicationResource {
private NiFiServiceFacade serviceFacade;
@@ -51,28 +58,99 @@ public class HistoryResource extends ApplicationResource {
/**
* Queries the history of this Controller.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param offset The offset into the data. This parameter is required and is used in conjunction with count.
- * @param count The number of rows that should be returned. This parameter is required and is used in conjunction with page.
- * @param sortColumn The column to sort on. This parameter is optional. If not specified the results will be returned with the most recent first.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param offset The offset into the data. This parameter is required and is
+ * used in conjunction with count.
+ * @param count The number of rows that should be returned. This parameter
+ * is required and is used in conjunction with page.
+ * @param sortColumn The column to sort on. This parameter is optional. If
+ * not specified the results will be returned with the most recent first.
* @param sortOrder The sort order.
- * @param startDate The start date/time for the query. The start date/time must be formatted as 'MM/dd/yyyy HH:mm:ss'. This parameter is optional and must be specified in the timezone of the
- * server. The server's timezone can be determined by inspecting the result of a status or history request.
- * @param endDate The end date/time for the query. The end date/time must be formatted as 'MM/dd/yyyy HH:mm:ss'. This parameter is optional and must be specified in the timezone of the server. The
- * server's timezone can be determined by inspecting the result of a status or history request.
- * @param userName The user name of the user who's actions are being queried. This parameter is optional.
- * @param sourceId The id of the source being queried (usually a processor id). This parameter is optional.
+ * @param startDate The start date/time for the query. The start date/time
+ * must be formatted as 'MM/dd/yyyy HH:mm:ss'. This parameter is optional
+ * and must be specified in the timezone of the server. The server's
+ * timezone can be determined by inspecting the result of a status or
+ * history request.
+ * @param endDate The end date/time for the query. The end date/time must be
+ * formatted as 'MM/dd/yyyy HH:mm:ss'. This parameter is optional and must
+ * be specified in the timezone of the server. The server's timezone can be
+ * determined by inspecting the result of a status or history request.
+ * @param userName The user name of the user who's actions are being
+ * queried. This parameter is optional.
+ * @param sourceId The id of the source being queried (usually a processor
+ * id). This parameter is optional.
* @return A historyEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response queryHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @QueryParam("offset") IntegerParameter offset, @QueryParam("count") IntegerParameter count,
- @QueryParam("sortColumn") String sortColumn, @QueryParam("sortOrder") String sortOrder,
- @QueryParam("startDate") DateTimeParameter startDate, @QueryParam("endDate") DateTimeParameter endDate,
- @QueryParam("userName") String userName, @QueryParam("sourceId") String sourceId) {
+ @ApiOperation(
+ value = "Gets configuration history",
+ response = HistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response queryHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The offset into the result set.",
+ required = true
+ )
+ @QueryParam("offset") IntegerParameter offset,
+ @ApiParam(
+ value = "The number of actions to return.",
+ required = true
+ )
+ @QueryParam("count") IntegerParameter count,
+ @ApiParam(
+ value = "The field to sort on.",
+ required = false
+ )
+ @QueryParam("sortColumn") String sortColumn,
+ @ApiParam(
+ value = "The direction to sort.",
+ required = false
+ )
+ @QueryParam("sortOrder") String sortOrder,
+ @ApiParam(
+ value = "Include actions after this date.",
+ required = false
+ )
+ @QueryParam("startDate") DateTimeParameter startDate,
+ @ApiParam(
+ value = "Include actions before this date.",
+ required = false
+ )
+ @QueryParam("endDate") DateTimeParameter endDate,
+ @ApiParam(
+ value = "Include actions performed by this user.",
+ required = false
+ )
+ @QueryParam("userName") String userName,
+ @ApiParam(
+ value = "Include actions on this component.",
+ required = false
+ )
+ @QueryParam("sourceId") String sourceId) {
// ensure the page is specified
if (offset == null) {
@@ -148,16 +226,45 @@ public class HistoryResource extends ApplicationResource {
/**
* Gets the action for the corresponding id.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the action to get.
* @return An actionEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
@Path("{id}")
- @TypeHint(ActionEntity.class)
- public Response getAction(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiOperation(
+ value = "Gets an action",
+ response = ActionEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getAction(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The action id.",
+ required = true
+ )
@PathParam("id") IntegerParameter id) {
// ensure the id was specified
@@ -184,16 +291,42 @@ public class HistoryResource extends ApplicationResource {
/**
* Deletes flow history from the specified end date.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param endDate The end date for the purge action.
* @return A historyEntity
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response deleteHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Purge actions before this date/time.",
+ required = true
+ )
@QueryParam("endDate") DateTimeParameter endDate) {
// ensure the end date is specified
@@ -219,17 +352,45 @@ public class HistoryResource extends ApplicationResource {
/**
* Gets the actions for the specified processor.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param processorId The id of the processor.
* @return An processorHistoryEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
@Path("/processors/{processorId}")
- @TypeHint(ComponentHistoryEntity.class)
+ @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
+ @ApiOperation(
+ value = "Gets configuration history for a processor",
+ response = ComponentHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProcessorHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
@PathParam("processorId") final String processorId) {
// create the revision
@@ -248,17 +409,45 @@ public class HistoryResource extends ApplicationResource {
/**
* Gets the actions for the specified controller service.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param controllerServiceId The id of the controller service.
* @return An componentHistoryEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
@Path("/controller-services/{controllerServiceId}")
- @TypeHint(ComponentHistoryEntity.class)
+ @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
+ @ApiOperation(
+ value = "Gets configuration history for a controller service",
+ response = ComponentHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getControllerServiceHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The controller service id.",
+ required = true
+ )
@PathParam("controllerServiceId") final String controllerServiceId) {
// create the revision
@@ -277,17 +466,45 @@ public class HistoryResource extends ApplicationResource {
/**
* Gets the actions for the specified reporting task.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param reportingTaskId The id of the reporting task.
* @return An componentHistoryEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
@Path("/reporting-tasks/{reportingTaskId}")
- @TypeHint(ComponentHistoryEntity.class)
+ @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
+ @ApiOperation(
+ value = "Gets configuration history for a reporting task",
+ response = ComponentHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getReportingTaskHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The reporting task id.",
+ required = true
+ )
@PathParam("reportingTaskId") final String reportingTaskId) {
// create the revision
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 4e446fb..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -55,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;
@@ -63,6 +68,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing an Input Port.
*/
+@Api(hidden = true)
public class InputPortResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(InputPortResource.class);
@@ -101,10 +107,34 @@ public class InputPortResource extends ApplicationResource {
* @return A inputPortsEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getInputPorts(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets all input ports",
+ response = InputPortsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getInputPorts(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -141,8 +171,8 @@ public class InputPortResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -187,11 +217,30 @@ public class InputPortResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createInputPort(
@Context HttpServletRequest httpServletRequest,
- InputPortEntity portEntity) {
+ @ApiParam(
+ value = "The input port configuration details.",
+ required = true
+ ) InputPortEntity portEntity) {
if (portEntity == null || portEntity.getInputPort() == null) {
throw new IllegalArgumentException("Port details must be specified.");
@@ -266,11 +315,39 @@ public class InputPortResource extends ApplicationResource {
* @return A inputPortEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(InputPortEntity.class)
- public Response getInputPort(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets an input port",
+ response = InputPortEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getInputPort(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The input port id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -315,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,
@@ -386,11 +462,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateInputPort(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The input port id.",
+ required = true
+ )
@PathParam("id") String id,
- InputPortEntity portEntity) {
+ @ApiParam(
+ value = "The input port configuration details.",
+ required = true
+ ) InputPortEntity portEntity) {
if (portEntity == null || portEntity.getInputPort() == null) {
throw new IllegalArgumentException("Input port details must be specified.");
@@ -456,14 +554,42 @@ public class InputPortResource extends ApplicationResource {
* @return A inputPortEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeInputPort(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The input port id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 6b12d0e..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -55,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;
@@ -63,6 +68,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Label.
*/
+@Api(hidden = true)
public class LabelResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(LabelResource.class);
@@ -101,10 +107,34 @@ public class LabelResource extends ApplicationResource {
* @return A labelsEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getLabels(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets all labels",
+ response = LabelsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getLabels(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -143,8 +173,8 @@ public class LabelResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -197,11 +227,30 @@ public class LabelResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createLabel(
@Context HttpServletRequest httpServletRequest,
- LabelEntity labelEntity) {
+ @ApiParam(
+ value = "The label configuration details.",
+ required = true
+ ) LabelEntity labelEntity) {
if (labelEntity == null || labelEntity.getLabel() == null) {
throw new IllegalArgumentException("Label details must be specified.");
@@ -275,11 +324,39 @@ public class LabelResource extends ApplicationResource {
* @return A labelEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(LabelEntity.class)
- public Response getLabel(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets a label",
+ response = LabelEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getLabel(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The label id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -326,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,
@@ -404,11 +480,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateLabel(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The label id.",
+ required = true
+ )
@PathParam("id") String id,
- LabelEntity labelEntity) {
+ @ApiParam(
+ value = "The label configuraiton details.",
+ required = true
+ ) LabelEntity labelEntity) {
if (labelEntity == null || labelEntity.getLabel() == null) {
throw new IllegalArgumentException("Label details must be specified.");
@@ -473,14 +571,42 @@ public class LabelResource extends ApplicationResource {
* @return A entity containing the client id and an updated revision.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasRole('ROLE_DFM')")
- @TypeHint(LabelEntity.class)
+ @ApiOperation(
+ value = "Deletes a label",
+ response = LabelEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeLabel(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The label id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 bb0eba9..c88cc68 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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -40,12 +46,12 @@ 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;
/**
* RESTful endpoint for managing a cluster connection.
*/
+@Api(hidden = true)
public class NodeResource extends ApplicationResource {
private NiFiServiceFacade serviceFacade;
@@ -59,11 +65,39 @@ public class NodeResource extends ApplicationResource {
* @return A nodeEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(NodeEntity.class)
- public Response getNode(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets a node in the cluster",
+ response = NodeEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getNode(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The node id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
@@ -95,11 +129,39 @@ public class NodeResource extends ApplicationResource {
* @return A processGroupStatusEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ProcessGroupStatusEntity.class)
- public Response getNodeStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets process group status for a node in the cluster",
+ response = ProcessGroupStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getNodeStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The node id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
// get the node statistics
@@ -129,11 +191,39 @@ public class NodeResource extends ApplicationResource {
* @return A systemDiagnosticsEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}/system-diagnostics")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(SystemDiagnosticsEntity.class)
- public Response getNodeSystemDiagnostics(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets system diagnostics for a node in the cluester",
+ response = SystemDiagnosticsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getNodeSystemDiagnostics(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The node id.",
+ required = true
+ )
+ @PathParam("id") String id) {
if (properties.isClusterManager()) {
// get the node statistics
@@ -169,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,
@@ -206,8 +295,33 @@ public class NodeResource extends ApplicationResource {
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}")
@PreAuthorize("hasAnyRole('ROLE_ADMIN')")
- @TypeHint(NodeEntity.class)
- public Response updateNode(@PathParam("id") String id, NodeEntity nodeEntity) {
+ @ApiOperation(
+ value = "Updates a node in the cluster",
+ response = NodeEntity.class,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response updateNode(
+ @ApiParam(
+ value = "The node id.",
+ required = true
+ )
+ @PathParam("id") String id,
+ @ApiParam(
+ value = "The node configuration. The only configuration that will be honored at this endpoint is the status or primary flag.",
+ required = true
+ )
+ NodeEntity nodeEntity) {
if (properties.isClusterManager()) {
@@ -253,11 +367,36 @@ public class NodeResource extends ApplicationResource {
* @return A nodeEntity
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
+ @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,
+ authorizations = {
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response deleteNode(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The node id.",
+ required = true
+ )
@PathParam("id") String id) {
if (properties.isClusterManager()) {
[21/54] [abbrv] incubator-nifi git commit: NIFI-576: - Fixing clear
button. - Fixing issue with default selection in search location combo. -
Showing 0% during initial search request.
Posted by ma...@apache.org.
NIFI-576: - Fixing clear button. - Fixing issue with default selection in search location combo. - Showing 0% during initial search request.
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f59491c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f59491c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f59491c8
Branch: refs/heads/master
Commit: f59491c8db7588bbe65bb8d5a76adf7f448583a0
Parents: 22ded80
Author: Matt Gilman <ma...@gmail.com>
Authored: Sun May 3 17:59:41 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun May 3 18:03:03 2015 -0400
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/css/provenance.css | 3 ++-
.../webapp/js/nf/provenance/nf-provenance-lineage.js | 7 ++++++-
.../main/webapp/js/nf/provenance/nf-provenance-table.js | 12 ++++++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f59491c8/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
index 751a647..58a0bbc 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
@@ -238,6 +238,7 @@ input.searchable-field-input {
#provenance-search-location {
height: 18px;
line-height: 18px;
+ width: 424px;
}
/* event details dialog */
@@ -465,8 +466,8 @@ div.progress-label {
display: block;
font-weight: bold;
text-align: center;
- margin-top: -19px;
width: 378px;
+ margin-top: 4px;
}
/* provenance table */
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f59491c8/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
index 42c49cf..eb7c6de 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
@@ -44,7 +44,12 @@ nf.ProvenanceLineage = (function () {
handler: {
close: function () {
// reset the progress bar
- $('#lineage-percent-complete').progressbar('value', 0);
+ var lineageProgressBar = $('#lineage-percent-complete');
+ lineageProgressBar.find('div.progress-label').remove();
+
+ // update the progress bar
+ var label = $('<div class="progress-label"></div>').text('0%');
+ lineageProgressBar.progressbar('value', 0).append(label);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f59491c8/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
index 9451a34..499925d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
@@ -418,7 +418,12 @@ nf.ProvenanceTable = (function () {
handler: {
close: function () {
// reset the progress bar
- $('#provenance-percent-complete').progressbar('value', 0);
+ var provenanceProgressBar = $('#provenance-percent-complete');
+ provenanceProgressBar.find('div.progress-label').remove();
+
+ // update the progress bar
+ var label = $('<div class="progress-label"></div>').text('0%');
+ provenanceProgressBar.progressbar('value', 0).append(label);
}
}
});
@@ -535,7 +540,7 @@ nf.ProvenanceTable = (function () {
}
// reset the stored query
- query = {};
+ cachedQuery = {};
// reload the table
nf.ProvenanceTable.loadProvenanceTable();
@@ -975,6 +980,9 @@ nf.ProvenanceTable = (function () {
// update the progress bar
var label = $('<div class="progress-label"></div>').text(value + '%');
+ if (value > 0) {
+ label.css('margin-top', '-19px');
+ }
progressBar.progressbar('value', value).append(label);
},
[18/54] [abbrv] incubator-nifi git commit: NIFI-572 possible null
dereference in PersistentProvenanceRepository.submitQuery
Posted by ma...@apache.org.
NIFI-572 possible null dereference in PersistentProvenanceRepository.submitQuery
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/018473b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/018473b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/018473b3
Branch: refs/heads/master
Commit: 018473b352ef5216e8581fa843b1a3a958c51d9b
Parents: fea59e3
Author: Mark Latimer <ma...@gmail.com>
Authored: Sat May 2 12:18:51 2015 +0100
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun May 3 17:13:22 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/provenance/PersistentProvenanceRepository.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/018473b3/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
index 27f2cbb..5da5d6f 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/PersistentProvenanceRepository.java
@@ -1438,9 +1438,10 @@ public class PersistentProvenanceRepository implements ProvenanceEventRepository
trimmed = latestList;
}
- final Long maxEventId = getMaxEventId();
+ Long maxEventId = getMaxEventId();
if (maxEventId == null) {
result.getResult().update(Collections.<ProvenanceEventRecord>emptyList(), 0L);
+ maxEventId = 0L;
}
Long minIndexedId = indexConfig.getMinIdIndexed();
if (minIndexedId == null) {
[47/54] [abbrv] incubator-nifi git commit: NIFI-429: Updated parent
to point to released version
Posted by ma...@apache.org.
NIFI-429: Updated parent to point to released version
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0b8533f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0b8533f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0b8533f8
Branch: refs/heads/master
Commit: 0b8533f8ffbd2563cb2e52dd2fd99b0ec11173d4
Parents: a25fcb7
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 14:00:51 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 14:00:51 2015 -0400
----------------------------------------------------------------------
nifi-nar-maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0b8533f8/nifi-nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index 95cee00..accf8e6 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parent</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<relativePath />
</parent>
<artifactId>nifi-nar-maven-plugin</artifactId>
[49/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare for next
development iteration
Posted by ma...@apache.org.
NIFI-429: prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0cc481d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0cc481d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0cc481d4
Branch: refs/heads/master
Commit: 0cc481d4ce5e4b889d0ad088f27fe05cf60cf38e
Parents: 1fc8453
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 14:02:04 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 14:02:04 2015 -0400
----------------------------------------------------------------------
nifi-nar-maven-plugin/pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/0cc481d4/nifi-nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index 443ff9e..f6e104c 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<relativePath />
</parent>
<artifactId>nifi-nar-maven-plugin</artifactId>
- <version>1.0.1-incubating</version>
+ <version>1.0.2-incubating-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
<build>
@@ -101,8 +101,4 @@
<version>3.3</version>
</dependency>
</dependencies>
-
- <scm>
- <tag>nifi-nar-maven-plugin-1.0.1-incubating-rc13</tag>
- </scm>
</project>
[40/54] [abbrv] incubator-nifi git commit: NIFI-584 remove javadoc
author tags.
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
index 4b10be6..eff62b9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.StringUtils;
* This class overrides hashCode and equals and considers two instances to be
* equal if they have the equal IDs.
*
- * @author unattributed
* @Immutable
* @Threadsafe
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java
index 11a3912..4023660 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java
@@ -21,7 +21,6 @@ package org.apache.nifi.cluster.protocol;
*
* @param <T> The type of protocol message.
*
- * @author unattributed
*/
public interface ProtocolContext<T> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java
index b6c3737..247f73d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolException.java
@@ -20,7 +20,6 @@ package org.apache.nifi.cluster.protocol;
* The base exception for problems encountered while communicating within the
* cluster.
*
- * @author unattributed
*/
public class ProtocolException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java
index 4e43d4d..6fd921e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java
@@ -24,7 +24,6 @@ import java.io.OutputStream;
*
* @param <T> The type of protocol message.
*
- * @author unattributed
*/
public interface ProtocolMessageMarshaller<T> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java
index dc22ba0..48d7056 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/UnknownServiceAddressException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.protocol;
/**
* Represents the exceptional case when a service's address is not known.
*
- * @author unattributed
*/
public class UnknownServiceAddressException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
index 2837f1a..8eb83a4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderListener.java
@@ -35,7 +35,6 @@ import org.apache.nifi.reporting.BulletinRepository;
* A wrapper class for consolidating a protocol sender and listener for the
* cluster manager.
*
- * @author unattributed
*/
public class ClusterManagerProtocolSenderListener implements ClusterManagerProtocolSender, ProtocolListener {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java
index 64ca7fa..a49847f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
* which case, no service discovery occurs and the caller will always receive
* the configured service.
*
- * @author unattributed
*/
public class ClusterServiceLocator implements ServiceDiscovery {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
index 3458760..0bb13d4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java
@@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory;
* The instance must be stopped before termination of the JVM to ensure proper
* resource clean-up.
*
- * @author unattributed
*/
public class ClusterServicesBroadcaster implements MulticastServicesBroadcaster {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java
index 90f9124..8ca5141 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListener.java
@@ -55,7 +55,6 @@ import org.slf4j.LoggerFactory;
* instance must be stopped before termination of the JVM to ensure proper
* resource clean-up.
*
- * @author unattributed
*/
public class MulticastProtocolListener extends MulticastListener implements ProtocolListener {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
index 172f459..d48e0ee 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListener.java
@@ -49,7 +49,6 @@ import org.slf4j.LoggerFactory;
/**
* Implements a listener for protocol messages sent over unicast socket.
*
- * @author unattributed
*/
public class SocketProtocolListener extends SocketListener implements ProtocolListener {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java
index c81c7e0..85f4a3f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionRequest.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
/**
- * @author unattributed
*/
public class AdaptedConnectionRequest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java
index 6c8b49d..6046702 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedConnectionResponse.java
@@ -22,7 +22,6 @@ import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.cluster.protocol.StandardDataFlow;
/**
- * @author unattributed
*/
public class AdaptedConnectionResponse {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java
index 72d716c..311a470 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java
@@ -17,7 +17,6 @@
package org.apache.nifi.cluster.protocol.jaxb.message;
/**
- * @author unattributed
*/
public class AdaptedCounter {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java
index 571d846..683fdf5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java
@@ -17,7 +17,6 @@
package org.apache.nifi.cluster.protocol.jaxb.message;
/**
- * @author unattributed
*/
public class AdaptedDataFlow {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java
index 81714f5..cec3757 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
/**
- * @author unattributed
*/
public class AdaptedHeartbeat {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java
index d9f3577..5df8ec7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
/**
- * @author unattributed
*/
public class AdaptedNodeBulletins {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java
index 8d0eddd..3bbf7b6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java
@@ -17,7 +17,6 @@
package org.apache.nifi.cluster.protocol.jaxb.message;
/**
- * @author unattributed
*/
public class AdaptedNodeIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java
index 37256a3..21f9770 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionRequestAdapter.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.nifi.cluster.protocol.ConnectionRequest;
/**
- * @author unattributed
*/
public class ConnectionRequestAdapter extends XmlAdapter<AdaptedConnectionRequest, ConnectionRequest> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java
index 633f81a..baabc33 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ConnectionResponseAdapter.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.nifi.cluster.protocol.ConnectionResponse;
/**
- * @author unattributed
*/
public class ConnectionResponseAdapter extends XmlAdapter<AdaptedConnectionResponse, ConnectionResponse> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java
index dbc83b8..520b8eb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java
@@ -21,7 +21,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.nifi.cluster.protocol.StandardDataFlow;
/**
- * @author unattributed
*/
public class DataFlowAdapter extends XmlAdapter<AdaptedDataFlow, StandardDataFlow> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java
index 989d827..412332f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.nifi.cluster.protocol.Heartbeat;
/**
- * @author unattributed
*/
public class HeartbeatAdapter extends XmlAdapter<AdaptedHeartbeat, Heartbeat> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java
index 565882d..cbb6747 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java
@@ -20,7 +20,6 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
/**
- * @author unattributed
*/
public final class JaxbProtocolUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java
index 859d8b7..ab3126c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.nifi.cluster.protocol.NodeBulletins;
/**
- * @author unattributed
*/
public class NodeBulletinsAdapter extends XmlAdapter<AdaptedNodeBulletins, NodeBulletins> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
index 7594266..da54658 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
/**
- * @author unattributed
*/
public class NodeIdentifierAdapter extends XmlAdapter<AdaptedNodeIdentifier, NodeIdentifier> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
index 89956c1..f0a9fa7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java
@@ -35,7 +35,6 @@ import org.apache.nifi.cluster.protocol.message.ReconnectionResponseMessage;
import org.apache.nifi.cluster.protocol.message.ServiceBroadcastMessage;
/**
- * @author unattributed
*/
@XmlRegistry
public class ObjectFactory {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java
index 09c03f1..d47b26f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ConnectionRequestMessage.java
@@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.nifi.cluster.protocol.ConnectionRequest;
/**
- * @author unattributed
*/
@XmlRootElement(name = "connectionRequestMessage")
public class ConnectionRequestMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java
index 4ac9275..3d3bd43 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ControllerStartupFailureMessage.java
@@ -23,7 +23,6 @@ import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.cluster.protocol.jaxb.message.NodeIdentifierAdapter;
/**
- * @author unattributed
*/
@XmlRootElement(name = "controllerStartupFailureMessage")
public class ControllerStartupFailureMessage extends ExceptionMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java
index 7665274..6da5241 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/DisconnectMessage.java
@@ -22,7 +22,6 @@ import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.cluster.protocol.jaxb.message.NodeIdentifierAdapter;
/**
- * @author unattributed
*/
@XmlRootElement(name = "disconnectionMessage")
public class DisconnectMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java
index dbc7bc1..65fab0f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ExceptionMessage.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.protocol.message;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * @author unattributed
*/
@XmlRootElement(name = "exceptionMessage")
public class ExceptionMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java
index f72e270..594f6f6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowRequestMessage.java
@@ -22,7 +22,6 @@ import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.cluster.protocol.jaxb.message.NodeIdentifierAdapter;
/**
- * @author unattributed
*/
@XmlRootElement(name = "flowRequestMessage")
public class FlowRequestMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java
index cc0538c..3b1610c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/FlowResponseMessage.java
@@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.nifi.cluster.protocol.StandardDataFlow;
/**
- * @author unattributed
*/
@XmlRootElement(name = "flowResponseMessage")
public class FlowResponseMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java
index 05f40ac..15432b1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java
@@ -20,7 +20,6 @@ import org.apache.nifi.cluster.protocol.Heartbeat;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * @author unattributed
*/
@XmlRootElement(name = "heartbeatMessage")
public class HeartbeatMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java
index 83c284c..e4fa9cb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/MulticastProtocolMessage.java
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlRootElement;
* multicast. The identifier is necessary for the sender to identify a message
* sent by it.
*
- * @author unattributed
*/
@XmlRootElement(name = "multicastMessage")
public class MulticastProtocolMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java
index 45e4dba..6df3ba4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java
@@ -20,7 +20,6 @@ import org.apache.nifi.cluster.protocol.NodeBulletins;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * @author unattributed
*/
@XmlRootElement(name = "nodeBulletinsMessage")
public class NodeBulletinsMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java
index c9cb39f..b6ada4d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PingMessage.java
@@ -20,7 +20,6 @@ import java.util.Date;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * @author unattributed
*/
@XmlRootElement(name = "pingMessage")
public class PingMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java
index db11f92..4b7563a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java
@@ -22,7 +22,6 @@ import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.cluster.protocol.jaxb.message.NodeIdentifierAdapter;
/**
- * @author unattributed
*/
@XmlRootElement(name = "primaryRoleAssignmentMessage")
public class PrimaryRoleAssignmentMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java
index 6d67d21..bd00346 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ReconnectionRequestMessage.java
@@ -24,7 +24,6 @@ import org.apache.nifi.cluster.protocol.StandardDataFlow;
import org.apache.nifi.cluster.protocol.jaxb.message.NodeIdentifierAdapter;
/**
- * @author unattributed
*/
@XmlRootElement(name = "reconnectionRequestMessage")
public class ReconnectionRequestMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java
index 113b719..d0b546c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/message/ServiceBroadcastMessage.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.protocol.message;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * @author unattributed
*/
@XmlRootElement(name = "serviceBroadcastMessage")
public class ServiceBroadcastMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java
index 8df6dcb..90817b2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java
@@ -38,7 +38,6 @@ import org.junit.Ignore;
import org.junit.Test;
/**
- * @author unattributed
*/
public class ClusterServiceDiscoveryTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
index 5e98397..24dd17d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java
@@ -35,7 +35,6 @@ import org.junit.Ignore;
import org.junit.Test;
/**
- * @author unattributed
*/
public class ClusterServicesBroadcasterTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
index bc10c20..cac5bf2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
@@ -39,7 +39,6 @@ import org.junit.Before;
import org.junit.Test;
/**
- * @author unattributed
*/
public class SocketProtocolListenerTest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java
index 07ee83a..d6d83ef 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/DelayedProtocolHandler.java
@@ -23,7 +23,6 @@ import org.apache.nifi.cluster.protocol.ProtocolHandler;
import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
/**
- * @author unattributed
*/
public class DelayedProtocolHandler implements ProtocolHandler {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java
index 803797b..ccf2c4c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java
@@ -23,7 +23,6 @@ import org.apache.nifi.cluster.protocol.ProtocolHandler;
import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
/**
- * @author unattributed
*/
public class ReflexiveProtocolHandler implements ProtocolHandler {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/Event.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/Event.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/Event.java
index aae93ef..510579f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/Event.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/Event.java
@@ -22,7 +22,6 @@ import org.apache.commons.lang3.StringUtils;
/**
* Events describe the occurrence of something noteworthy. They record the event's source, a timestamp, a description, and a category.
*
- * @author unattributed
*
* @Immutable
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java
index 3c9d441..8411e5b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/EventManager.java
@@ -22,7 +22,6 @@ import java.util.List;
* Manages an ordered list of events. The event history size dictates the total number of events to manage for a given source at a given time. When the size is exceeded, the oldest event for that
* source is evicted.
*
- * @author unattributed
*/
public interface EventManager {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java
index 411d6c3..c9cd6a5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java
@@ -31,7 +31,6 @@ import org.apache.nifi.cluster.event.EventManager;
/**
* Implements the EventManager.
*
- * @author unattributed
*/
public class EventManagerImpl implements EventManager {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java
index 2803d4c..a5e78bf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java
@@ -22,7 +22,6 @@ import org.apache.nifi.cluster.protocol.StandardDataFlow;
/**
* A dataflow with additional information about the cluster.
*
- * @author unattributed
*/
public class ClusterDataFlow {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java
index 6ff15a7..aed86c9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DaoException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.flow;
/**
* A base exception for data access exceptions.
*
- * @author unattributed
*/
public class DaoException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java
index c5134e3..861095f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.flow;
/**
* A data access object for loading and saving the flow managed by the cluster.
*
- * @author unattributed
*/
public interface DataFlowDao {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
index b3afc6e..166632c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java
@@ -27,7 +27,6 @@ package org.apache.nifi.cluster.flow;
* </li>
* </ul>
*
- * @author unattributed
*/
public enum PersistedFlowState {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
index 169712a..0318e7b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/StaleFlowException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.flow;
/**
* Represents the exceptional case when a caller is requesting the current flow, but a current flow is not available.
*
- * @author unattributed
*/
public class StaleFlowException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
index e7aafb7..5554247 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
@@ -84,7 +84,6 @@ import org.w3c.dom.Element;
* When the flow state file is saved, it is always saved first to the restore directory followed by a save to the primary directory. When the flow state file is loaded, a check is made to verify that
* the primary and restore flow state files are both current. If either is not current, then an exception is thrown. The primary flow state file is always read when the load method is called.
*
- * @author unattributed
*/
public class DataFlowDaoImpl implements DataFlowDao {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java
index 5a7c1a9..22450da 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java
@@ -53,7 +53,6 @@ import org.slf4j.LoggerFactory;
* By default, the service will try to update the flow as quickly as possible. Configuring a delay enables a less aggressive retrieval strategy. Specifically, the eligible retrieval time is reset
* every time the flow state is set to STALE. If the state is set to UNKNOWN or CURRENT, then the flow will not be retrieved.
*
- * @author unattributed
*/
public class DataFlowManagementServiceImpl implements DataFlowManagementService {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java
index be57562..336d675 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/ClusterManager.java
@@ -49,7 +49,6 @@ import org.apache.nifi.reporting.BulletinRepository;
* Since only a single node may execute isolated processors, the cluster manager maintains the notion of a primary node. The primary node is chosen at cluster startup and retains the role until a user
* requests a different node to be the primary node.
*
- * @author unattributed
*/
public interface ClusterManager extends NodeInformant {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java
index 97ae070..5a15b4b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpClusterManager.java
@@ -33,7 +33,6 @@ import java.util.Set;
* Extends the ClusterManager interface to define how requests issued to the cluster manager are federated to the nodes. Specifically, the HTTP protocol is used for communicating requests to the
* cluster manager and to the nodes.
*
- * @author unattributed
*/
public interface HttpClusterManager extends ClusterManager {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java
index 2b91dbd..470c6ba 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java
@@ -28,7 +28,6 @@ import org.apache.nifi.cluster.protocol.NodeIdentifier;
*
* Clients must call start() and stop() to initialize and shutdown the instance. The instance must be started before issuing any replication requests.
*
- * @author unattributed
*/
public interface HttpRequestReplicator {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java
index 64c9d75..fda9ecf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/HttpResponseMapper.java
@@ -24,7 +24,6 @@ import org.apache.nifi.cluster.node.Node.Status;
/**
* Maps a HTTP response to a node status.
*
- * @author unattributed
*/
public interface HttpResponseMapper {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java
index ae113f4..2789f78 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java
@@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory;
*
* This class overrides hashCode and equals and considers two instances to be equal if they have the equal NodeIdentifiers.
*
- * @author unattributed
*/
public class NodeResponse {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java
index 3bf9752..e93acca 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ClusterException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* The base exception class for cluster related exceptions.
*
- * @author unattributed
*/
public class ClusterException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java
index 964cdfc..a698b0f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/ConnectingNodeMutableRequestException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a HTTP request that may change a node's dataflow is to be replicated while a node is connecting to the cluster.
*
- * @author unattributed
*/
public class ConnectingNodeMutableRequestException extends MutableRequestException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java
index e0f3433..5374019 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/DisconnectedNodeMutableRequestException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a HTTP request that may change a node's dataflow is to be replicated while one or more nodes are disconnected.
*
- * @author unattributed
*/
public class DisconnectedNodeMutableRequestException extends MutableRequestException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java
index b3d2826..e10e9c3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalClusterStateException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Signals that an operation to be performed on a cluster has been invoked at an illegal or inappropriate time.
*
- * @author unattributed
*/
public class IllegalClusterStateException extends ClusterException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java
index 3e1c031..b4eed3d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDeletionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a deletion request is issued to a node that cannot be deleted (e.g., the node is not disconnected).
*
- * @author unattributed
*/
public class IllegalNodeDeletionException extends IllegalClusterStateException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java
index 71fe044..1199ef7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeDisconnectionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a disconnection request is issued to a node that cannot be disconnected (e.g., last node in cluster, node is primary node).
*
- * @author unattributed
*/
public class IllegalNodeDisconnectionException extends IllegalClusterStateException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java
index 63242d0..3f71296 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IllegalNodeReconnectionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when a reconnection request is issued to a node that cannot be reconnected (e.g., the node is not disconnected).
*
- * @author unattributed
*/
public class IllegalNodeReconnectionException extends IllegalClusterStateException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java
index a224078..26b22f8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/IneligiblePrimaryNodeException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when the primary role cannot be assigned to a node because the node is ineligible for the role.
*
- * @author unattributed
*/
public class IneligiblePrimaryNodeException extends IllegalClusterStateException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java
index 2c0ba5f..a78f34c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/MutableRequestException.java
@@ -20,7 +20,6 @@ package org.apache.nifi.cluster.manager.exception;
* Represents the exceptional case when a HTTP request that may change a node's state is to be replicated while the cluster or connected nodes are unable to change their state (e.g., a new node is
* connecting to the cluster).
*
- * @author unattributed
*/
public class MutableRequestException extends IllegalClusterStateException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java
index b350015..7a828e3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/exception/NoConnectedNodesException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.manager.exception;
/**
* Represents the exceptional case when the cluster is unable to service a request because no nodes are connected.
*
- * @author unattributed
*/
public class NoConnectedNodesException extends ClusterException {
[05/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 9e34201..4883721 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
@@ -17,6 +17,12 @@
package org.apache.nifi.web.api;
import com.sun.jersey.api.core.ResourceContext;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.util.HashMap;
@@ -74,13 +80,16 @@ 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;
/**
* RESTful endpoint for managing a Flow Controller.
*/
@Path("/controller")
+@Api(
+ value = "/controller",
+ description = "Provides realtime command and control of this NiFi instance"
+)
public class ControllerResource extends ApplicationResource {
private NiFiServiceFacade serviceFacade;
@@ -96,6 +105,10 @@ public class ControllerResource extends ApplicationResource {
* @return the Provenance sub-resource
*/
@Path("/provenance")
+ @ApiOperation(
+ value = "Gets the provenance resource",
+ response = ProvenanceResource.class
+ )
public ProvenanceResource getProvenanceResource() {
return resourceContext.getResource(ProvenanceResource.class);
}
@@ -106,6 +119,10 @@ public class ControllerResource extends ApplicationResource {
* @return the User sub-resource
*/
@Path("/users")
+ @ApiOperation(
+ value = "Gets the user resource",
+ response = UserResource.class
+ )
public UserResource getUserResource() {
return resourceContext.getResource(UserResource.class);
}
@@ -116,6 +133,10 @@ public class ControllerResource extends ApplicationResource {
* @return the User sub-resource
*/
@Path("/user-groups")
+ @ApiOperation(
+ value = "Gets the user group resource",
+ response = UserGroupResource.class
+ )
public UserGroupResource getUserGroupResource() {
return resourceContext.getResource(UserGroupResource.class);
}
@@ -126,6 +147,10 @@ public class ControllerResource extends ApplicationResource {
* @return the History sub-resource
*/
@Path("/history")
+ @ApiOperation(
+ value = "Gets the history resource",
+ response = HistoryResource.class
+ )
public HistoryResource getHistoryResource() {
return resourceContext.getResource(HistoryResource.class);
}
@@ -136,6 +161,10 @@ public class ControllerResource extends ApplicationResource {
* @return the History sub-resource
*/
@Path("/bulletin-board")
+ @ApiOperation(
+ value = "Gets the bulletin board resource",
+ response = BulletinBoardResource.class
+ )
public BulletinBoardResource getBulletinBoardResource() {
return resourceContext.getResource(BulletinBoardResource.class);
}
@@ -146,6 +175,10 @@ public class ControllerResource extends ApplicationResource {
* @return the Template sub-resource
*/
@Path("/templates")
+ @ApiOperation(
+ value = "Gets the template resource",
+ response = TemplateResource.class
+ )
public TemplateResource getTemplateResource() {
return resourceContext.getResource(TemplateResource.class);
}
@@ -156,6 +189,10 @@ public class ControllerResource extends ApplicationResource {
* @return the Snippets sub-resource
*/
@Path("/snippets")
+ @ApiOperation(
+ value = "Gets the snippet resource",
+ response = SnippetResource.class
+ )
public SnippetResource getSnippetResource() {
return resourceContext.getResource(SnippetResource.class);
}
@@ -166,6 +203,10 @@ public class ControllerResource extends ApplicationResource {
* @return the Controller Services sub-resource
*/
@Path("/controller-services")
+ @ApiOperation(
+ value = "Gets the controller service resource",
+ response = ControllerServiceResource.class
+ )
public ControllerServiceResource getControllerServiceResource() {
return resourceContext.getResource(ControllerServiceResource.class);
}
@@ -176,6 +217,10 @@ public class ControllerResource extends ApplicationResource {
* @return the Reporting Tasks sub-resource
*/
@Path("/reporting-tasks")
+ @ApiOperation(
+ value = "Gets the reporting task resource",
+ response = ReportingTaskResource.class
+ )
public ReportingTaskResource getReportingTaskResource() {
return resourceContext.getResource(ReportingTaskResource.class);
}
@@ -187,7 +232,17 @@ public class ControllerResource extends ApplicationResource {
* @return the Group sub-resource
*/
@Path("/process-groups/{process-group-id}")
- public ProcessGroupResource getGroupResource(@PathParam("process-group-id") String groupId) {
+ @ApiOperation(
+ value = "Gets the process group resource",
+ response = ProcessGroupResource.class
+ )
+ public ProcessGroupResource getGroupResource(
+ @ApiParam(
+ value = "The id of the process group that is the parent of the requested resource(s). If the desired process group is "
+ + "the root group an alias 'root' may be used as the process-group-id.",
+ required = true
+ )
+ @PathParam("process-group-id") String groupId) {
ProcessGroupResource groupResource = resourceContext.getResource(ProcessGroupResource.class);
groupResource.setGroupId(groupId);
return groupResource;
@@ -215,10 +270,28 @@ public class ControllerResource extends ApplicationResource {
* @return A controllerEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@PreAuthorize("hasRole('ROLE_NIFI')")
- @TypeHint(ControllerEntity.class)
- public Response getController(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Returns the details about this NiFi necessary to communicate via site to site",
+ response = ControllerEntity.class,
+ authorizations = @Authorization(value = "NiFi", type = "ROLE_NIFI")
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getController(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
if (properties.isClusterManager()) {
return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse();
@@ -247,10 +320,27 @@ public class ControllerResource extends ApplicationResource {
* @return A searchResultsEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response searchController(@QueryParam("q") @DefaultValue(StringUtils.EMPTY) String value) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -284,10 +374,36 @@ 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 "
+ + "that was actually created. The archive that is created cannot be referenced "
+ + "at a later time, therefore there is no corresponding URI. Instead the "
+ + "request URI is returned.",
+ response = ProcessGroupEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createArchive(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = true
+ )
@FormParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
@@ -331,10 +447,35 @@ public class ControllerResource extends ApplicationResource {
* @return A revisionEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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",
+ notes = "NiFi employs an optimistic locking strategy where the client must include a revision in their request when "
+ + "performing an update. If the specified revision does not match the current base revision a 409 status code "
+ + "is returned. The revision is comprised of a clientId and a version number. The version is a simple integer "
+ + "value that is incremented with each change. Including the most recent version tells NiFi that your working "
+ + "with the most recent flow. In addition to the version the client who is performing the updates is recorded. "
+ + "This allows the same client to submit multiple requests without having to wait for the previously ones to "
+ + "return. Invoking this endpoint will return the current base revision. It is also available when retrieving "
+ + "a process group and in the response of all mutable requests.",
+ response = Entity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getRevision() {
// create the current revision
final RevisionDTO revision = serviceFacade.getRevision();
@@ -354,11 +495,33 @@ public class ControllerResource extends ApplicationResource {
* @return A controllerStatusEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/status")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ControllerStatusEntity.class)
- public Response getControllerStatus(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets the current status of this NiFi",
+ response = Entity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getControllerStatus(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
final ControllerStatusDTO controllerStatus = serviceFacade.getControllerStatus();
@@ -382,11 +545,33 @@ public class ControllerResource extends ApplicationResource {
* @return A countersEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/counters")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(CountersEntity.class)
- public Response getCounters(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets the current counters for this NiFi",
+ response = Entity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getCounters(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
final CountersDTO countersReport = serviceFacade.getCounters();
@@ -412,12 +597,32 @@ public class ControllerResource extends ApplicationResource {
* @return A counterEntity.
*/
@PUT
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/counters/{id}")
- @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(CounterEntity.class)
+ @PreAuthorize("hasRole('ROLE_DFM')")
+ @ApiOperation(
+ value = "Updates the specified counter. This will reset the counter value to 0",
+ response = CounterEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateCounter(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
@PathParam("id") String id) {
@@ -455,11 +660,35 @@ public class ControllerResource extends ApplicationResource {
* @return A controllerConfigurationEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/config")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN', 'ROLE_NIFI')")
- @TypeHint(ControllerConfigurationEntity.class)
- public Response getControllerConfig(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Retrieves the configuration for this NiFi",
+ response = ControllerConfigurationEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN"),
+ @Authorization(value = "ROLE_NIFI", type = "ROLE_NIFI")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getControllerConfig(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+
// replicate if cluster manager
if (properties.isClusterManager()) {
return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse();
@@ -498,7 +727,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,
@@ -550,10 +778,27 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateControllerConfig(
@Context HttpServletRequest httpServletRequest,
- ControllerConfigurationEntity configEntity) {
+ @ApiParam(
+ value = "The controller configuration.",
+ required = true
+ ) ControllerConfigurationEntity configEntity) {
if (configEntity == null || configEntity.getConfig() == null) {
throw new IllegalArgumentException("Controller configuration must be specified");
@@ -606,11 +851,34 @@ public class ControllerResource extends ApplicationResource {
* @return A authoritiesEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/authorities")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(AuthorityEntity.class)
- public Response getAuthorities(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Retrieves the user details, including the authorities, about the user making the request",
+ response = AuthorityEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getAuthorities(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+
// note that the cluster manager will handle this request directly
final NiFiUser user = NiFiUserUtils.getNiFiUser();
if (user == null) {
@@ -638,11 +906,33 @@ public class ControllerResource extends ApplicationResource {
* @return A bannerEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/banners")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(BannerEntity.class)
- public Response getBanners(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Retrieves the banners for this NiFi",
+ response = BannerEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getBanners(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -676,11 +966,33 @@ public class ControllerResource extends ApplicationResource {
* @return A processorTypesEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/processor-types")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ProcessorTypesEntity.class)
- public Response getProcessorTypes(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Retrieves the types of processors that this NiFi supports",
+ response = ProcessorTypesEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessorTypes(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -708,12 +1020,37 @@ public class ControllerResource extends ApplicationResource {
* @return A controllerServicesTypesEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getControllerServiceTypes(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "If specified, will only return controller services of this type.",
+ required = false
+ )
@QueryParam("serviceType") String serviceType) {
// replicate if cluster manager
@@ -741,11 +1078,33 @@ public class ControllerResource extends ApplicationResource {
* @return A controllerServicesTypesEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/reporting-task-types")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ReportingTaskTypesEntity.class)
- public Response getReportingTaskTypes(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Retrieves the types of reporting tasks that this NiFi supports",
+ response = ReportingTaskTypesEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getReportingTaskTypes(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -772,11 +1131,33 @@ public class ControllerResource extends ApplicationResource {
* @return A prioritizerTypesEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/prioritizers")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(PrioritizerTypesEntity.class)
- public Response getPrioritizers(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Retrieves the types of prioritizers that this NiFi supports",
+ response = PrioritizerTypesEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getPrioritizers(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -803,11 +1184,33 @@ public class ControllerResource extends ApplicationResource {
* @return An aboutEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/about")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(AboutEntity.class)
- public Response getAboutInfo(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Retrieves details about this NiFi to put in the About dialog",
+ response = AboutEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getAboutInfo(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 90d031d..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -66,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;
@@ -74,6 +79,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Controller Service.
*/
+@Api(hidden = true)
public class ControllerServiceResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(ControllerServiceResource.class);
@@ -121,7 +127,8 @@ public class ControllerServiceResource extends ApplicationResource {
}
/**
- * Parses the availability and ensure that the specified availability makes sense for the given NiFi instance.
+ * Parses the availability and ensure that the specified availability makes
+ * sense for the given NiFi instance.
*
* @param availability avail
* @return avail
@@ -145,17 +152,49 @@ public class ControllerServiceResource extends ApplicationResource {
/**
* Retrieves all the of controller services in this NiFi.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @return A controllerServicesEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{availability}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ControllerServicesEntity.class)
- public Response getControllerServices(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("availability") String availability) {
+ @ApiOperation(
+ value = "Gets all controller services",
+ response = ControllerServicesEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getControllerServices(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability) {
+
final Availability avail = parseAvailability(availability);
// replicate if cluster manager
@@ -183,10 +222,14 @@ public class ControllerServiceResource extends ApplicationResource {
* Creates a new controller service.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param type The type of controller service to create.
* @return A controllerServiceEntity.
*/
@@ -195,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,
@@ -226,8 +268,9 @@ public class ControllerServiceResource extends ApplicationResource {
* Creates a new Controller Service.
*
* @param httpServletRequest request
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param controllerServiceEntity A controllerServiceEntity.
* @return A controllerServiceEntity.
*/
@@ -236,11 +279,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createControllerService(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
@PathParam("availability") String availability,
- ControllerServiceEntity controllerServiceEntity) {
+ @ApiParam(
+ value = "The controller service configuration details.",
+ required = true
+ ) ControllerServiceEntity controllerServiceEntity) {
final Availability avail = parseAvailability(availability);
@@ -315,19 +380,55 @@ public class ControllerServiceResource extends ApplicationResource {
/**
* Retrieves the specified controller service.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param id The id of the controller service to retrieve
* @return A controllerServiceEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{availability}/{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ControllerServiceEntity.class)
- public Response getControllerService(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets a controller service",
+ response = ControllerServiceEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getControllerService(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The controller service id.",
+ required = true
+ )
+ @PathParam("id") String id) {
final Availability avail = parseAvailability(availability);
@@ -354,20 +455,58 @@ public class ControllerServiceResource extends ApplicationResource {
/**
* Returns the descriptor for the specified property.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param availability avail
* @param id The id of the controller service.
* @param propertyName The property
* @return a propertyDescriptorEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getPropertyDescriptor(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id,
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The controller service id.",
+ required = true
+ )
+ @PathParam("id") String id,
+ @ApiParam(
+ value = "The property name to return the descriptor for.",
+ required = true
+ )
@QueryParam("propertyName") String propertyName) {
final Availability avail = parseAvailability(availability);
@@ -401,20 +540,55 @@ public class ControllerServiceResource extends ApplicationResource {
/**
* Retrieves the references of the specified controller service.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param id The id of the controller service to retrieve
* @return A controllerServiceEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getControllerServiceReferences(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id) {
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The controller service id.",
+ required = true
+ )
+ @PathParam("id") String id) {
final Availability avail = parseAvailability(availability);
@@ -442,26 +616,70 @@ public class ControllerServiceResource extends ApplicationResource {
* Updates the references of the specified controller service.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param id The id of the controller service to retrieve
- * @param state Sets the state of referencing components. A value of RUNNING or STOPPED will update referencing schedulable components (Processors and Reporting Tasks). A value of ENABLED or
- * DISABLED will update referencing controller services.
+ * @param state Sets the state of referencing components. A value of RUNNING
+ * or STOPPED will update referencing schedulable components (Processors and
+ * Reporting Tasks). A value of ENABLED or DISABLED will update referencing
+ * controller services.
* @return A controllerServiceEntity.
*/
@PUT
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{availability}/{id}/references")
- @PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ControllerServiceEntity.class)
+ @PreAuthorize("hasRole('ROLE_DFM')")
+ @ApiOperation(
+ value = "Updates a controller services references",
+ response = ControllerServiceEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateControllerServiceReferences(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@FormParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id,
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The controller service id.",
+ required = true
+ )
+ @PathParam("id") String id,
+ @ApiParam(
+ value = "The new state of the references for the controller service.",
+ allowableValues = "ENABLED, DISABLED, RUNNING, STOPPED",
+ required = true
+ )
@FormParam("state") @DefaultValue(StringUtils.EMPTY) String state) {
// parse the state to determine the desired action
@@ -536,18 +754,26 @@ public class ControllerServiceResource extends ApplicationResource {
* Updates the specified controller service.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param id The id of the controller service to update.
* @param name The name of the controller service
* @param annotationData The annotation data for the controller service
* @param comments The comments for the controller service
- * @param state The state of this controller service. Should be ENABLED or DISABLED.
- * @param markedForDeletion Array of property names whose value should be removed.
- * @param formParams Additionally, the processor properties and styles are specified in the form parameters. Because the property names and styles differ from processor to processor they are
- * specified in a map-like fashion:
+ * @param state The state of this controller service. Should be ENABLED or
+ * DISABLED.
+ * @param markedForDeletion Array of property names whose value should be
+ * removed.
+ * @param formParams Additionally, the processor properties and styles are
+ * specified in the form parameters. Because the property names and styles
+ * differ from processor to processor they are specified in a map-like
+ * fashion:
* <br>
* <ul>
* <li>properties[required.file.path]=/path/to/file</li>
@@ -565,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,
@@ -632,8 +857,9 @@ public class ControllerServiceResource extends ApplicationResource {
* Updates the specified a new Controller Service.
*
* @param httpServletRequest request
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param id The id of the controller service to update.
* @param controllerServiceEntity A controllerServiceEntity.
* @return A controllerServiceEntity.
@@ -643,12 +869,39 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateControllerService(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
@PathParam("availability") String availability,
+ @ApiParam(
+ value = "The controller service id.",
+ required = true
+ )
@PathParam("id") String id,
- ControllerServiceEntity controllerServiceEntity) {
+ @ApiParam(
+ value = "The controller service configuration details.",
+ required = true
+ ) ControllerServiceEntity controllerServiceEntity) {
final Availability avail = parseAvailability(availability);
@@ -709,23 +962,61 @@ public class ControllerServiceResource extends ApplicationResource {
* Removes the specified controller service.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the controller service is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all services should use the node
- * availability.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the controller service is available on the
+ * NCM only (ncm) or on the nodes only (node). If this instance is not
+ * clustered all services should use the node availability.
* @param id The id of the controller service to remove.
* @return A entity containing the client id and an updated revision.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeControllerService(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id) {
+ @ApiParam(
+ value = "Whether the controller service is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The controller service id.",
+ required = true
+ )
+ @PathParam("id") String id) {
final Availability avail = parseAvailability(availability);
[26/54] [abbrv] incubator-nifi git commit: NIFI-588: - Hiding
secondary actions as the screen size gets smaller.
Posted by ma...@apache.org.
NIFI-588:
- Hiding secondary actions as the screen size gets smaller.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/37e5548a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/37e5548a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/37e5548a
Branch: refs/heads/master
Commit: 37e5548ac19ee1580663f66682020c04272798c2
Parents: e98c074
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon May 4 16:46:44 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon May 4 16:46:44 2015 -0400
----------------------------------------------------------------------
.../webapp/js/nf/canvas/nf-canvas-header.js | 17 +++++++++
.../webapp/js/nf/canvas/nf-canvas-toolbar.js | 36 ++++++++++----------
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 4 +--
.../webapp/js/nf/canvas/nf-toolbar-action.js | 11 ++++--
4 files changed, 46 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/37e5548a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
index ff5d2f2..5cc1eff 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
@@ -19,6 +19,8 @@
nf.CanvasHeader = (function () {
+ var MIN_TOOLBAR_WIDTH = 640;
+
var config = {
urls: {
helpDocument: '../nifi-docs/documentation',
@@ -308,6 +310,21 @@ nf.CanvasHeader = (function () {
}
}
});
+
+ var toolbar = $('#toolbar');
+ var groupButton = $('#action-group');
+ $(window).on('resize', function() {
+ if (toolbar.width() < MIN_TOOLBAR_WIDTH && groupButton.is(':visible')) {
+ toolbar.find('.secondary').hide();
+ } else if (toolbar.width() > MIN_TOOLBAR_WIDTH && groupButton.is(':hidden')) {
+ toolbar.find('.secondary').show();
+ }
+ });
+
+ // set up the initial visibility
+ if (toolbar.width() < MIN_TOOLBAR_WIDTH) {
+ toolbar.find('.secondary').hide();
+ }
},
/**
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/37e5548a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
index 8347f37..cecf7d5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbar.js
@@ -48,24 +48,24 @@ nf.CanvasToolbar = (function () {
actions['template'] = new nf.ToolbarAction(globalControls, 'template', 'action-template', 'template', 'template-hover', 'template-disable', 'Create Template');
border.clone().appendTo(globalControls);
separator.clone().appendTo(globalControls);
- border.clone().appendTo(globalControls);
- actions['copy'] = new nf.ToolbarAction(globalControls, 'copy', 'action-copy', 'copy', 'copy-hover', 'copy-disable', 'Copy');
- border.clone().appendTo(globalControls);
- actions['paste'] = new nf.ToolbarAction(globalControls, 'paste', 'action-paste', 'paste', 'paste-hover', 'paste-disable', 'Paste');
- border.clone().appendTo(globalControls);
- separator.clone().appendTo(globalControls);
- border.clone().appendTo(globalControls);
- actions['group'] = new nf.ToolbarAction(globalControls, 'group', 'action-group', 'group', 'group-hover', 'group-disable', 'Group');
- border.appendTo(globalControls);
- separator.clone().appendTo(globalControls);
- border.clone().appendTo(globalControls);
- actions['fill'] = new nf.ToolbarAction(globalControls, 'fillColor', 'action-fill', 'fill', 'fill-hover', 'fill-disable', 'Change Color');
- border.clone().appendTo(globalControls);
- separator.clone().appendTo(globalControls);
- border.clone().appendTo(globalControls);
- actions['delete'] = new nf.ToolbarAction(globalControls, 'delete', 'action-delete', 'delete', 'delete-hover', 'delete-disable', 'Delete');
- border.appendTo(globalControls);
- separator.appendTo(globalControls);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ actions['copy'] = new nf.ToolbarAction(globalControls, 'copy', 'action-copy', 'copy', 'copy-hover', 'copy-disable', 'Copy', true);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ actions['paste'] = new nf.ToolbarAction(globalControls, 'paste', 'action-paste', 'paste', 'paste-hover', 'paste-disable', 'Paste', true);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ separator.clone().addClass('secondary').appendTo(globalControls);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ actions['group'] = new nf.ToolbarAction(globalControls, 'group', 'action-group', 'group', 'group-hover', 'group-disable', 'Group', true);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ separator.clone().addClass('secondary').appendTo(globalControls);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ actions['fill'] = new nf.ToolbarAction(globalControls, 'fillColor', 'action-fill', 'fill', 'fill-hover', 'fill-disable', 'Change Color', true);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ separator.clone().addClass('secondary').appendTo(globalControls);
+ border.clone().addClass('secondary').appendTo(globalControls);
+ actions['delete'] = new nf.ToolbarAction(globalControls, 'delete', 'action-delete', 'delete', 'delete-hover', 'delete-disable', 'Delete', true);
+ border.addClass('secondary').appendTo(globalControls);
+ separator.addClass('secondary').appendTo(globalControls);
// set up initial states for selection-less items
if (nf.Common.isDFM()) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/37e5548a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
index 38894d8..ca45a3d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
@@ -1090,9 +1090,9 @@ nf.Canvas = (function () {
initCanvas();
nf.Canvas.View.init();
nf.ContextMenu.init();
- nf.CanvasHeader.init();
- nf.CanvasToolbox.init();
nf.CanvasToolbar.init();
+ nf.CanvasToolbox.init();
+ nf.CanvasHeader.init();
nf.GraphControl.init();
nf.Search.init();
nf.Settings.init();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/37e5548a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js
index c3adfd6..a7b5f20 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-toolbar-action.js
@@ -27,8 +27,9 @@
* @argument {string} hoverCls The css class for the hover state of the element
* @argument {string} disableCls The css class for the disabled state of the element
* @argument {string} title The title (tooltip) of the element
+ * @argument {boolean} secondary If secondary icon will be hidden as the screen gets smallers
*/
-nf.ToolbarAction = function (container, action, id, cls, hoverCls, disableCls, title) {
+nf.ToolbarAction = function (container, action, id, cls, hoverCls, disableCls, title, secondary) {
this.container = container;
this.action = action;
this.id = id;
@@ -36,6 +37,7 @@ nf.ToolbarAction = function (container, action, id, cls, hoverCls, disableCls, t
this.hoverCls = hoverCls;
this.disableCls = disableCls;
this.title = title;
+ this.secondary = secondary;
this.initAction();
};
@@ -46,6 +48,7 @@ nf.ToolbarAction.prototype.cls = null;
nf.ToolbarAction.prototype.hoverCls = null;
nf.ToolbarAction.prototype.disableCls = null;
nf.ToolbarAction.prototype.title = null;
+nf.ToolbarAction.prototype.secondary = null;
/**
* Initializes the toolbar action by dynamically creating an element,
@@ -53,9 +56,13 @@ nf.ToolbarAction.prototype.title = null;
*/
nf.ToolbarAction.prototype.initAction = function () {
var self = this;
+ var cls = 'toolbar-icon';
+ if (this.secondary === true) {
+ cls += ' secondary';
+ }
// create the default button
- $('<div/>').addClass('toolbar-icon').attr('id', this.id).attr('title', this.title).mouseover(function () {
+ $('<div/>').addClass(cls).attr('id', this.id).attr('title', this.title).mouseover(function () {
if (!$(this).hasClass(self.disableCls)) {
$(this).removeClass(self.cls).addClass(self.hoverCls);
}
[45/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare release
nifi-parent-1.0.0-incubating-rc13
Posted by ma...@apache.org.
NIFI-429: prepare release nifi-parent-1.0.0-incubating-rc13
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/37732bdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/37732bdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/37732bdd
Branch: refs/heads/master
Commit: 37732bddcfcb2affcba1f3b4a9e3dd5ebd7b5a30
Parents: c4d1666
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 13:58:36 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 13:58:36 2015 -0400
----------------------------------------------------------------------
nifi-parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/37732bdd/nifi-parent/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml
index fb2f827..9c26d15 100644
--- a/nifi-parent/pom.xml
+++ b/nifi-parent/pom.xml
@@ -23,7 +23,7 @@
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parent</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<packaging>pom</packaging>
<description>The nifi-parent enables each apache nifi project to ensure consistent approaches and DRY</description>
<url>http://nifi.incubator.apache.org</url>
@@ -60,7 +60,7 @@
<connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url>
- <tag>HEAD</tag>
+ <tag>nifi-parent-1.0.0-incubating-rc13</tag>
</scm>
<issueManagement>
<system>JIRA</system>
[16/54] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a43eecf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a43eecf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a43eecf1
Branch: refs/heads/master
Commit: a43eecf1bde9b7ab30fbfdcdf5bd1d04fa2f0985
Parents: 34c81e1 b6b8c95
Author: joewitt <jo...@apache.org>
Authored: Sat May 2 16:43:44 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Sat May 2 16:43:44 2015 -0400
----------------------------------------------------------------------
.../nifi-resources/src/main/resources/conf/logback.xml | 3 +++
.../java/org/apache/nifi/web/api/SystemDiagnosticsResource.java | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[37/54] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e1aa4890
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e1aa4890
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e1aa4890
Branch: refs/heads/master
Commit: e1aa4890a003309f8a9038cd05f47af54aff4452
Parents: f0a5c11 b70845b
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed May 6 10:58:54 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed May 6 10:58:54 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/util/NiFiPropertiesTest.java | 23 +++++++++++-----
.../org/apache/nifi/nar/NarUnpackerTest.java | 29 ++++++++++++--------
2 files changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[02/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 c506b9b..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -61,7 +67,7 @@ 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.apache.nifi.web.api.entity.ConnectionsEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -69,6 +75,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Remote group.
*/
+@Api(hidden = true)
public class RemoteProcessGroupResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(RemoteProcessGroupResource.class);
@@ -114,11 +121,38 @@ public class RemoteProcessGroupResource extends ApplicationResource {
* @return A remoteProcessGroupEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getRemoteProcessGroups(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether to include any encapulated ports or just details about the remote process group.",
+ required = false
+ )
@QueryParam("verbose") @DefaultValue(VERBOSE_DEFAULT_VALUE) Boolean verbose) {
// replicate if cluster manager
@@ -158,13 +192,43 @@ public class RemoteProcessGroupResource extends ApplicationResource {
* @return A remoteProcessGroupEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getRemoteProcessGroup(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether to include any encapulated ports or just details about the remote process group.",
+ required = false
+ )
@QueryParam("verbose") @DefaultValue(VERBOSE_DEFAULT_VALUE) Boolean verbose,
+ @ApiParam(
+ value = "The remote process group id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -200,11 +264,39 @@ public class RemoteProcessGroupResource extends ApplicationResource {
* @return A statusHistoryEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}/status/history")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(StatusHistoryEntity.class)
- public Response getRemoteProcessGroupStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets the status history",
+ response = StatusHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getRemoteProcessGroupStatusHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The remote process group id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -241,8 +333,8 @@ public class RemoteProcessGroupResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -287,11 +379,32 @@ public class RemoteProcessGroupResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createRemoteProcessGroup(
@Context HttpServletRequest httpServletRequest,
- RemoteProcessGroupEntity remoteProcessGroupEntity) {
+ @ApiParam(
+ value = "The remote process group configuration details.",
+ required = true
+ ) RemoteProcessGroupEntity remoteProcessGroupEntity) {
if (remoteProcessGroupEntity == null || remoteProcessGroupEntity.getRemoteProcessGroup() == null) {
throw new IllegalArgumentException("Remote process group details must be specified.");
@@ -400,14 +513,42 @@ public class RemoteProcessGroupResource extends ApplicationResource {
* @return A remoteProcessGroupEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeRemoteProcessGroup(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The remote process group id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -462,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,
@@ -514,7 +654,22 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateRemoteProcessGroupInputPort(
@Context HttpServletRequest httpServletRequest,
@PathParam("id") String id,
@@ -592,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,
@@ -644,7 +798,22 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateRemoteProcessGroupOutputPort(
@Context HttpServletRequest httpServletRequest,
@PathParam("id") String id,
@@ -723,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,
@@ -777,7 +945,22 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateRemoteProcessGroup(
@Context HttpServletRequest httpServletRequest,
@PathParam("id") String id,
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 8aea04c..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -62,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;
@@ -70,6 +75,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Reporting Task.
*/
+@Api(hidden = true)
public class ReportingTaskResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(ReportingTaskResource.class);
@@ -117,7 +123,8 @@ public class ReportingTaskResource extends ApplicationResource {
}
/**
- * Parses the availability and ensure that the specified availability makes sense for the given NiFi instance.
+ * Parses the availability and ensure that the specified availability makes
+ * sense for the given NiFi instance.
*/
private Availability parseAvailability(final String availability) {
final Availability avail;
@@ -138,16 +145,49 @@ public class ReportingTaskResource extends ApplicationResource {
/**
* Retrieves all the of reporting tasks in this NiFi.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the reporting task is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all tasks should use the node availability.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the reporting task is available on the NCM
+ * only (ncm) or on the nodes only (node). If this instance is not clustered
+ * all tasks should use the node availability.
* @return A reportingTasksEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{availability}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ReportingTasksEntity.class)
- public Response getReportingTasks(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("availability") String availability) {
+ @ApiOperation(
+ value = "Gets all reporting tasks",
+ response = ReportingTasksEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getReportingTasks(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability) {
+
final Availability avail = parseAvailability(availability);
// replicate if cluster manager
@@ -175,9 +215,14 @@ public class ReportingTaskResource extends ApplicationResource {
* Creates a new reporting task.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the reporting task is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all tasks should use the node availability.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the reporting task is available on the NCM
+ * only (ncm) or on the nodes only (node). If this instance is not clustered
+ * all tasks should use the node availability.
* @param type The type of reporting task to create.
* @return A reportingTaskEntity.
*/
@@ -186,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,
@@ -217,7 +261,9 @@ public class ReportingTaskResource extends ApplicationResource {
* Creates a new Reporting Task.
*
* @param httpServletRequest request
- * @param availability Whether the reporting task is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all tasks should use the node availability.
+ * @param availability Whether the reporting task is available on the NCM
+ * only (ncm) or on the nodes only (node). If this instance is not clustered
+ * all tasks should use the node availability.
* @param reportingTaskEntity A reportingTaskEntity.
* @return A reportingTaskEntity.
*/
@@ -226,11 +272,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createReportingTask(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
@PathParam("availability") String availability,
- ReportingTaskEntity reportingTaskEntity) {
+ @ApiParam(
+ value = "The reporting task configuration details.",
+ required = true
+ ) ReportingTaskEntity reportingTaskEntity) {
final Availability avail = parseAvailability(availability);
@@ -305,18 +373,55 @@ public class ReportingTaskResource extends ApplicationResource {
/**
* Retrieves the specified reporting task.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the reporting task is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all tasks should use the node availability.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the reporting task is available on the NCM
+ * only (ncm) or on the nodes only (node). If this instance is not clustered
+ * all tasks should use the node availability.
* @param id The id of the reporting task to retrieve
* @return A reportingTaskEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{availability}/{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ReportingTaskEntity.class)
- public Response getReportingTask(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets a reporting task",
+ response = ReportingTaskEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getReportingTask(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The reporting task id.",
+ required = true
+ )
+ @PathParam("id") String id) {
final Availability avail = parseAvailability(availability);
@@ -343,20 +448,58 @@ public class ReportingTaskResource extends ApplicationResource {
/**
* Returns the descriptor for the specified property.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param availability availability
* @param id The id of the reporting task.
* @param propertyName The property
* @return a propertyDescriptorEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getPropertyDescriptor(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id,
+ @ApiParam(
+ value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The reporting task id.",
+ required = true
+ )
+ @PathParam("id") String id,
+ @ApiParam(
+ value = "The property name.",
+ required = true
+ )
@QueryParam("propertyName") String propertyName) {
final Availability avail = parseAvailability(availability);
@@ -391,19 +534,27 @@ public class ReportingTaskResource extends ApplicationResource {
* Updates the specified reporting task.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the reporting task is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all tasks should use the node availability.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the reporting task is available on the NCM
+ * only (ncm) or on the nodes only (node). If this instance is not clustered
+ * all tasks should use the node availability.
* @param id The id of the reporting task to update.
* @param name The name of the reporting task
* @param annotationData The annotation data for the reporting task
- * @param markedForDeletion Array of property names whose value should be removed.
+ * @param markedForDeletion Array of property names whose value should be
+ * removed.
* @param state The updated scheduled state
* @param schedulingStrategy The scheduling strategy for this reporting task
* @param schedulingPeriod The scheduling period for this reporting task
* @param comments The comments for this reporting task
- * @param formParams Additionally, the processor properties and styles are specified in the form parameters. Because the property names and styles differ from processor to processor they are
- * specified in a map-like fashion:
+ * @param formParams Additionally, the processor properties and styles are
+ * specified in the form parameters. Because the property names and styles
+ * differ from processor to processor they are specified in a map-like
+ * fashion:
* <br>
* <ul>
* <li>properties[required.file.path]=/path/to/file</li>
@@ -421,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,
@@ -491,7 +641,9 @@ public class ReportingTaskResource extends ApplicationResource {
* Updates the specified a Reporting Task.
*
* @param httpServletRequest request
- * @param availability Whether the reporting task is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all tasks should use the node availability.
+ * @param availability Whether the reporting task is available on the NCM
+ * only (ncm) or on the nodes only (node). If this instance is not clustered
+ * all tasks should use the node availability.
* @param id The id of the reporting task to update.
* @param reportingTaskEntity A reportingTaskEntity.
* @return A reportingTaskEntity.
@@ -501,12 +653,39 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateReportingTask(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
@PathParam("availability") String availability,
+ @ApiParam(
+ value = "The reporting task id.",
+ required = true
+ )
@PathParam("id") String id,
- ReportingTaskEntity reportingTaskEntity) {
+ @ApiParam(
+ value = "The reporting task configuration details.",
+ required = true
+ ) ReportingTaskEntity reportingTaskEntity) {
final Availability avail = parseAvailability(availability);
@@ -567,22 +746,61 @@ public class ReportingTaskResource extends ApplicationResource {
* Removes the specified reporting task.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param availability Whether the reporting task is available on the NCM only (ncm) or on the nodes only (node). If this instance is not clustered all tasks should use the node availability.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param availability Whether the reporting task is available on the NCM
+ * only (ncm) or on the nodes only (node). If this instance is not clustered
+ * all tasks should use the node availability.
* @param id The id of the reporting task to remove.
* @return A entity containing the client id and an updated revision.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeReportingTask(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("availability") String availability, @PathParam("id") String id) {
+ @ApiParam(
+ value = "Whether the reporting task is available on the NCM or nodes. If the NiFi is standalone the availability should be NODE.",
+ allowableValues = "NCM, NODE",
+ required = true
+ )
+ @PathParam("availability") String availability,
+ @ApiParam(
+ value = "The reporting task id.",
+ required = true
+ )
+ @PathParam("id") String id) {
final Availability avail = parseAvailability(availability);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 997fe4a..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
@@ -17,6 +17,12 @@
package org.apache.nifi.web.api;
import com.sun.jersey.api.core.ResourceContext;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -53,7 +59,7 @@ import org.apache.nifi.web.api.entity.SnippetEntity;
import org.apache.nifi.web.api.request.ClientIdParameter;
import org.apache.nifi.web.api.request.LongParameter;
import org.apache.commons.lang3.StringUtils;
-import org.codehaus.enunciate.jaxrs.TypeHint;
+import org.apache.nifi.web.api.entity.PropertyDescriptorEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -61,6 +67,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Snippet.
*/
+@Api(hidden = true)
public class SnippetResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(SnippetResource.class);
@@ -192,13 +199,20 @@ public class SnippetResource extends ApplicationResource {
* Creates a new snippet based on the specified contents.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param parentGroupId The id of the process group the components in this snippet belong to.
- * @param linked Whether or not this snippet is linked to the underlying data flow. If a linked snippet is deleted, the components that comprise the snippet are also deleted.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param parentGroupId The id of the process group the components in this
+ * snippet belong to.
+ * @param linked Whether or not this snippet is linked to the underlying
+ * data flow. If a linked snippet is deleted, the components that comprise
+ * the snippet are also deleted.
* @param processorIds The ids of any processors in this snippet.
* @param processGroupIds The ids of any process groups in this snippet.
- * @param remoteProcessGroupIds The ids of any remote process groups in this snippet.
+ * @param remoteProcessGroupIds The ids of any remote process groups in this
+ * snippet.
* @param inputPortIds The ids of any input ports in this snippet.
* @param outputPortIds The ids of any output ports in this snippet.
* @param connectionIds The ids of any connections in this snippet.
@@ -210,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,
@@ -266,10 +279,32 @@ public class SnippetResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createSnippet(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The snippet configuration details.",
+ required = true
+ )
final SnippetEntity snippetEntity) {
if (snippetEntity == null || snippetEntity.getSnippet() == null) {
@@ -347,19 +382,52 @@ public class SnippetResource extends ApplicationResource {
/**
* Retrieves the specified snippet.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param verbose Whether or not to include the contents of the snippet in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param verbose Whether or not to include the contents of the snippet in
+ * the response.
* @param id The id of the snippet to retrieve.
* @return A snippetEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getSnippet(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether to include configuration details for the components specified in the snippet.",
+ required = false
+ )
@QueryParam("verbose") @DefaultValue(VERBOSE) Boolean verbose,
+ @ApiParam(
+ value = "The snippet id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -391,12 +459,19 @@ public class SnippetResource extends ApplicationResource {
* Updates the specified snippet.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param verbose Whether or not to include the contents of the snippet in the response.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param verbose Whether or not to include the contents of the snippet in
+ * the response.
* @param id The id of the snippet to update.
- * @param parentGroupId The id of the process group to move the contents of this snippet to.
- * @param linked Whether or not this snippet is linked to the underlying data flow. If a linked snippet is deleted, the components that comprise the snippet are also deleted.
+ * @param parentGroupId The id of the process group to move the contents of
+ * this snippet to.
+ * @param linked Whether or not this snippet is linked to the underlying
+ * data flow. If a linked snippet is deleted, the components that comprise
+ * the snippet are also deleted.
* @return A snippetEntity.
*/
@PUT
@@ -404,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,
@@ -438,7 +512,8 @@ public class SnippetResource extends ApplicationResource {
}
/**
- * Updates the specified snippet. The contents of the snippet (component ids) cannot be updated once the snippet is created.
+ * Updates the specified snippet. The contents of the snippet (component
+ * ids) cannot be updated once the snippet is created.
*
* @param httpServletRequest request
* @param id The id of the snippet.
@@ -450,10 +525,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateSnippet(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The snippet id.",
+ required = true
+ )
@PathParam("id") String id,
+ @ApiParam(
+ value = "The snippet configuration details.",
+ required = true
+ )
final SnippetEntity snippetEntity) {
if (snippetEntity == null || snippetEntity.getSnippet() == null) {
@@ -516,20 +614,51 @@ public class SnippetResource extends ApplicationResource {
* Removes the specified snippet.
*
* @param httpServletRequest request
- * @param version The revision is used to verify the client is working with the latest version of the flow.
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param version The revision is used to verify the client is working with
+ * the latest version of the flow.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the snippet to remove.
* @return A entity containing the client id and an updated revision.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasRole('ROLE_DFM')")
- @TypeHint(SnippetEntity.class)
+ @ApiOperation(
+ value = "Deletes a snippet",
+ response = SnippetEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeSnippet(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The snippet id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 f747c47..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
@@ -16,6 +16,13 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -31,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;
@@ -40,6 +46,10 @@ import org.springframework.security.access.prepost.PreAuthorize;
* RESTful endpoint for retrieving system diagnostics.
*/
@Path("/system-diagnostics")
+@Api(
+ value = "/system-diagnostics",
+ description = "Provides diagnostics for the system NiFi is running on"
+)
public class SystemDiagnosticsResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(SystemDiagnosticsResource.class);
@@ -49,14 +59,37 @@ public class SystemDiagnosticsResource extends ApplicationResource {
/**
* Gets the system diagnostics for this NiFi instance.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @return A systemDiagnosticsEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getSystemDiagnostics(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets the diagnostics for the system NiFi is running on",
+ response = SystemDiagnosticsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),}
+ )
+ public Response getSystemDiagnostics(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+
final SystemDiagnosticsDTO systemDiagnosticsDto = serviceFacade.getSystemDiagnostics();
// create the revision
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 00707be..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
@@ -17,6 +17,12 @@
package org.apache.nifi.web.api;
import com.sun.jersey.multipart.FormDataParam;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.io.InputStream;
import java.net.URI;
import java.util.Date;
@@ -53,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;
@@ -61,6 +66,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Template.
*/
+@Api(hidden = true)
public class TemplateResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(TemplateResource.class);
@@ -94,14 +100,39 @@ public class TemplateResource extends ApplicationResource {
/**
* Retrieves all the of templates in this NiFi.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @return A templatesEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getTemplates(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets all templates",
+ response = TemplatesEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getTemplates(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -129,7 +160,9 @@ public class TemplateResource extends ApplicationResource {
* Creates a new template based off of the specified template.
*
* @param httpServletRequest request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param name The name of the template.
* @param description The description of the template.
* @param snippetId The id of the snippet this template is based on.
@@ -138,12 +171,45 @@ public class TemplateResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createTemplate(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @FormParam("name") String name, @FormParam("description") String description,
+ @ApiParam(
+ value = "The template name.",
+ required = true
+ )
+ @FormParam("name") String name,
+ @ApiParam(
+ value = "The template description.",
+ required = false
+ )
+ @FormParam("description") String description,
+ @ApiParam(
+ value = "The id of the snippet whose contents will comprise the template.",
+ required = true
+ )
@FormParam("snippetId") String snippetId) {
// replicate if cluster manager
@@ -178,15 +244,17 @@ public class TemplateResource extends ApplicationResource {
* Imports the specified template.
*
* @param httpServletRequest request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param in The template stream
* @return A templateEntity or an errorResponse XML snippet.
*/
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
@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,
@@ -247,8 +315,8 @@ public class TemplateResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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) {
@@ -299,17 +367,45 @@ public class TemplateResource extends ApplicationResource {
/**
* Retrieves the specified template.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the template to retrieve
* @return A templateEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response exportTemplate(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The template id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -339,18 +435,44 @@ public class TemplateResource extends ApplicationResource {
* Removes the specified template.
*
* @param httpServletRequest request
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
* @param id The id of the template to remove.
* @return A templateEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasRole('ROLE_DFM')")
- @TypeHint(TemplateEntity.class)
+ @ApiOperation(
+ value = "Deletes a template",
+ response = TemplateEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeTemplate(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The template id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
[03/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 a600d35..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -55,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;
@@ -63,6 +68,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing an Output Port.
*/
+@Api(hidden = true)
public class OutputPortResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(OutputPortResource.class);
@@ -101,10 +107,34 @@ public class OutputPortResource extends ApplicationResource {
* @return A outputPortsEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getOutputPorts(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets all output ports",
+ response = OutputPortsEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getOutputPorts(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -141,8 +171,8 @@ public class OutputPortResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -187,11 +217,30 @@ public class OutputPortResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createOutputPort(
@Context HttpServletRequest httpServletRequest,
- OutputPortEntity portEntity) {
+ @ApiParam(
+ value = "The output port configuration.",
+ required = true
+ ) OutputPortEntity portEntity) {
if (portEntity == null || portEntity.getOutputPort() == null) {
throw new IllegalArgumentException("Port details must be specified.");
@@ -266,11 +315,39 @@ public class OutputPortResource extends ApplicationResource {
* @return A outputPortEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(OutputPortEntity.class)
- public Response getOutputPort(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets an output port",
+ response = OutputPortEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getOutputPort(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The output port id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -315,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,
@@ -387,11 +463,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateOutputPort(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The output port id.",
+ required = true
+ )
@PathParam("id") String id,
- OutputPortEntity portEntity) {
+ @ApiParam(
+ value = "The output port configuration details.",
+ required = true
+ ) OutputPortEntity portEntity) {
if (portEntity == null || portEntity.getOutputPort() == null) {
throw new IllegalArgumentException("Output port details must be specified.");
@@ -457,14 +555,42 @@ public class OutputPortResource extends ApplicationResource {
* @return A outputPortEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeOutputPort(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The output port id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 2b3657e..3e82bad 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
@@ -17,6 +17,12 @@
package org.apache.nifi.web.api;
import com.sun.jersey.api.core.ResourceContext;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
@@ -62,12 +68,12 @@ 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;
/**
* RESTful endpoint for managing a Group.
*/
+@Api(hidden = true)
public class ProcessGroupResource extends ApplicationResource {
private static final String VERBOSE = "false";
@@ -87,6 +93,10 @@ public class ProcessGroupResource extends ApplicationResource {
* @return the processor resource within the specified group
*/
@Path("processors")
+ @ApiOperation(
+ value = "Gets the processor resource",
+ response = ProcessorResource.class
+ )
public ProcessorResource getProcessorResource() {
ProcessorResource processorResource = resourceContext.getResource(ProcessorResource.class);
processorResource.setGroupId(groupId);
@@ -99,6 +109,10 @@ public class ProcessGroupResource extends ApplicationResource {
* @return the connection sub-resource within the specified group
*/
@Path("connections")
+ @ApiOperation(
+ value = "Gets the connection resource",
+ response = ConnectionResource.class
+ )
public ConnectionResource getConnectionResource() {
ConnectionResource connectionResource = resourceContext.getResource(ConnectionResource.class);
connectionResource.setGroupId(groupId);
@@ -111,6 +125,10 @@ public class ProcessGroupResource extends ApplicationResource {
* @return the input ports sub-resource within the specified group
*/
@Path("input-ports")
+ @ApiOperation(
+ value = "Gets the input port resource",
+ response = InputPortResource.class
+ )
public InputPortResource getInputPortResource() {
InputPortResource inputPortResource = resourceContext.getResource(InputPortResource.class);
inputPortResource.setGroupId(groupId);
@@ -123,6 +141,10 @@ public class ProcessGroupResource extends ApplicationResource {
* @return the output ports sub-resource within the specified group
*/
@Path("output-ports")
+ @ApiOperation(
+ value = "Gets the output port resource",
+ response = OutputPortResource.class
+ )
public OutputPortResource getOutputPortResource() {
OutputPortResource outputPortResource = resourceContext.getResource(OutputPortResource.class);
outputPortResource.setGroupId(groupId);
@@ -135,6 +157,10 @@ public class ProcessGroupResource extends ApplicationResource {
* @return the label sub-resource within the specified group
*/
@Path("labels")
+ @ApiOperation(
+ value = "Gets the label resource",
+ response = LabelResource.class
+ )
public LabelResource getLabelResource() {
LabelResource labelResource = resourceContext.getResource(LabelResource.class);
labelResource.setGroupId(groupId);
@@ -147,6 +173,10 @@ public class ProcessGroupResource extends ApplicationResource {
* @return the funnel sub-resource within the specified group
*/
@Path("funnels")
+ @ApiOperation(
+ value = "Gets the funnel resource",
+ response = FunnelResource.class
+ )
public FunnelResource getFunnelResource() {
FunnelResource funnelResource = resourceContext.getResource(FunnelResource.class);
funnelResource.setGroupId(groupId);
@@ -159,6 +189,10 @@ public class ProcessGroupResource extends ApplicationResource {
* @return the remote process group sub-resource within the specified group
*/
@Path("remote-process-groups")
+ @ApiOperation(
+ value = "Gets the remote process group resource",
+ response = RemoteProcessGroupResource.class
+ )
public RemoteProcessGroupResource getRemoteProcessGroupResource() {
RemoteProcessGroupResource remoteProcessGroupResource = resourceContext.getResource(RemoteProcessGroupResource.class);
remoteProcessGroupResource.setGroupId(groupId);
@@ -242,12 +276,47 @@ public class ProcessGroupResource extends ApplicationResource {
* @return A processGroupEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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",
+ notes = "Gets a process group and includes all components contained in this group. The verbose and recursive flags can be used to adjust "
+ + "the default behavior. This endpoint is starting point for obtaining the current flow and consequently includes the current "
+ + "flow revision.",
+ response = ProcessGroupEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProcessGroup(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether the response should contain all encapsulated components or just the immediate children.",
+ required = false,
+ allowableValues = "true, false"
+ )
@QueryParam("recursive") @DefaultValue(RECURSIVE) Boolean recursive,
+ @ApiParam(
+ value = "Whether to include any encapulated components or just details about the process group.",
+ required = false
+ )
@QueryParam("verbose") @DefaultValue(VERBOSE) Boolean verbose) {
// replicate if cluster manager
@@ -296,13 +365,48 @@ 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,
+ authorizations = {
+ @Authorization(value = "ROLE_DFM", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response copySnippet(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@FormParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The snippet id.",
+ required = true
+ )
@FormParam("snippetId") String snippetId,
+ @ApiParam(
+ value = "The x coordinate of the origin of the bounding box where the new components will be placed.",
+ required = true
+ )
@FormParam("originX") DoubleParameter originX,
+ @ApiParam(
+ value = "The y coordinate of the origin of the bounding box where the new components will be placed.",
+ required = true
+ )
@FormParam("originY") DoubleParameter originY) {
// ensure the position has been specified
@@ -372,13 +476,48 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response instantiateTemplate(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@FormParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the template",
+ required = false
+ )
@FormParam("templateId") String templateId,
+ @ApiParam(
+ value = "The x coordinate of the origin of the bounding box where the new components will be placed.",
+ required = true
+ )
@FormParam("originX") DoubleParameter originX,
+ @ApiParam(
+ value = "The y coordinate of the origin of the bounding box where the new components will be placed.",
+ required = true
+ )
@FormParam("originY") DoubleParameter originY) {
// ensure the position has been specified
@@ -441,8 +580,8 @@ public class ProcessGroupResource extends ApplicationResource {
@PUT
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -481,10 +620,33 @@ public class ProcessGroupResource extends ApplicationResource {
@PUT
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateProcessGroup(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The process group to update. The only action that is supported at this endpoint is to set the running flag in order "
+ + "to start or stop all descendent schedulable components. This defines the schema of the expected input.",
+ required = true
+ )
ProcessGroupEntity processGroupEntity) {
if (processGroupEntity == null || processGroupEntity.getProcessGroup() == null) {
@@ -549,14 +711,48 @@ public class ProcessGroupResource extends ApplicationResource {
* @return A processGroupEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProcessGroup(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The process group id.",
+ required = false
+ )
@PathParam("id") String processGroupReferenceId,
+ @ApiParam(
+ value = "Whether the response should contain all encapsulated components or just the immediate children.",
+ required = false
+ )
@QueryParam("recursive") @DefaultValue(RECURSIVE) Boolean recursive,
+ @ApiParam(
+ value = "Whether to include any encapulated components or just details about the process group.",
+ required = false
+ )
@QueryParam("verbose") @DefaultValue(VERBOSE) Boolean verbose) {
// replicate if cluster manager
@@ -597,12 +793,38 @@ public class ProcessGroupResource extends ApplicationResource {
* @return A controllerEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProcessGroupReferences(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Whether to include any encapulated components or just details about the process group.",
+ required = false
+ )
@QueryParam("verbose") @DefaultValue(VERBOSE) Boolean verbose) {
// replicate if cluster manager
@@ -648,7 +870,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,
@@ -694,9 +915,28 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createProcessGroupReference(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The process group configuration details.",
+ required = true
+ )
ProcessGroupEntity processGroupEntity) {
if (processGroupEntity == null || processGroupEntity.getProcessGroup() == null) {
@@ -782,7 +1022,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,
@@ -836,10 +1075,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateProcessGroupReference(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The process group id.",
+ required = true
+ )
@PathParam("id") String id,
+ @ApiParam(
+ value = "The process group configuration details.",
+ required = true
+ )
ProcessGroupEntity processGroupEntity) {
if (processGroupEntity == null || processGroupEntity.getProcessGroup() == null) {
@@ -904,14 +1166,42 @@ public class ProcessGroupResource extends ApplicationResource {
* @return A processGroupEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response removeProcessGroupReference(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The process group id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -956,10 +1246,31 @@ public class ProcessGroupResource extends ApplicationResource {
* @return A processGroupStatusEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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",
+ notes = "The status for a process group includes status for all descendent components. When invoked on the root group with "
+ + "recursive set to true, it will return the current status of every component in the flow.",
+ response = ProcessGroupStatusEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN"),
+ @Authorization(value = "NiFi", type="ROLE_NIFI")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProcessGroupStatus(
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
@QueryParam("recursive") @DefaultValue(RECURSIVE) Boolean recursive) {
@@ -999,10 +1310,28 @@ public class ProcessGroupResource extends ApplicationResource {
* @return A processorEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProcessGroupStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 16c7e19..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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
@@ -75,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;
@@ -83,6 +88,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Processor.
*/
+@Api(hidden = true)
public class ProcessorResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(ProcessorResource.class);
@@ -148,9 +154,28 @@ public class ProcessorResource extends ApplicationResource {
* @return A processorsEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProcessors(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
// replicate if cluster manager
@@ -189,8 +214,8 @@ public class ProcessorResource extends ApplicationResource {
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -236,10 +261,30 @@ public class ProcessorResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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,
+ authorizations = {
+ @Authorization(value = "ROLE_DFM", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response createProcessor(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The processor configuration details.",
+ required = true
+ )
ProcessorEntity processorEntity) {
if (processorEntity == null || processorEntity.getProcessor() == null) {
@@ -320,11 +365,39 @@ public class ProcessorResource extends ApplicationResource {
* @return A processorEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(ProcessorEntity.class)
- public Response getProcessor(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets a processor",
+ response = ProcessorEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessor(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -355,11 +428,39 @@ public class ProcessorResource extends ApplicationResource {
* @return A statusHistoryEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}/status/history")
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
- @TypeHint(StatusHistoryEntity.class)
- public Response getProcessorStatusHistory(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId, @PathParam("id") String id) {
+ @ApiOperation(
+ value = "Gets status history for a processor",
+ response = StatusHistoryEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getProcessorStatusHistory(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
+ @PathParam("id") String id) {
// replicate if cluster manager
if (properties.isClusterManager()) {
@@ -391,13 +492,44 @@ public class ProcessorResource extends ApplicationResource {
* @return a propertyDescriptorEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getPropertyDescriptor(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @PathParam("id") String id, @QueryParam("propertyName") String propertyName) {
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
+ @PathParam("id") String id,
+ @ApiParam(
+ value = "The property name.",
+ required = true
+ )
+ @QueryParam("propertyName") String propertyName) {
// ensure the property name is specified
if (propertyName == null) {
@@ -466,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,
@@ -592,10 +723,33 @@ 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,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response updateProcessor(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
@PathParam("id") String id,
+ @ApiParam(
+ value = "The processor configuration details.",
+ required = true
+ )
ProcessorEntity processorEntity) {
if (processorEntity == null || processorEntity.getProcessor() == null) {
@@ -671,14 +825,42 @@ public class ProcessorResource extends ApplicationResource {
* @return A processorEntity.
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/{id}")
@PreAuthorize("hasRole('ROLE_DFM')")
- @TypeHint(ProcessorEntity.class)
+ @ApiOperation(
+ value = "Deletes a processor",
+ response = ProcessorEntity.class,
+ authorizations = {
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response deleteProcessor(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The revision is used to verify the client is working with the latest version of the flow.",
+ required = false
+ )
@QueryParam(VERSION) LongParameter version,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The processor id.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 4bfe3a0..afa404d 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
@@ -16,6 +16,12 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -77,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;
@@ -85,6 +90,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for querying data provenance.
*/
+@Api(hidden = true)
public class ProvenanceResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(ProvenanceResource.class);
@@ -117,11 +123,32 @@ public class ProvenanceResource extends ApplicationResource {
* @return A provenanceOptionsEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("/search-options")
@PreAuthorize("hasRole('ROLE_PROVENANCE')")
- @TypeHint(ProvenanceOptionsEntity.class)
- public Response getSearchOptions(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+ @ApiOperation(
+ value = "Gets the searchable attributes for provenance events",
+ response = ProvenanceOptionsEntity.class,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getSearchOptions(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId) {
+
// replicate if cluster manager
if (properties.isClusterManager()) {
return clusterManager.applyRequest(HttpMethod.GET, getAbsolutePath(), getRequestParameters(true), getHeaders()).getResponse();
@@ -153,14 +180,42 @@ public class ProvenanceResource extends ApplicationResource {
* @return A provenanceEventEntity
*/
@POST
+ @Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @PreAuthorize("hasRole('ROLE_PROVENANCE') and hasRole('ROLE_DFM')")
@Path("/replays")
- @TypeHint(ProvenanceEventEntity.class)
+ @PreAuthorize("hasRole('ROLE_PROVENANCE') and hasRole('ROLE_DFM')")
+ @ApiOperation(
+ value = "Replays content from a provenance event",
+ response = ProvenanceEventEntity.class,
+ authorizations = {
+ @Authorization(value = "Provenance and Data Flow Manager", type = "ROLE_PROVENANCE and ROLE_DFM")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response submitReplay(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@FormParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where the content exists if clustered.",
+ required = false
+ )
@FormParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The provenance event id.",
+ required = true
+ )
@FormParam("eventId") LongParameter eventId) {
// ensure the event id is specified
@@ -220,12 +275,40 @@ public class ProvenanceResource extends ApplicationResource {
* @return The content stream
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Path("/events/{id}/content/input")
@PreAuthorize("hasRole('ROLE_PROVENANCE')")
+ @ApiOperation(
+ value = "Gets the input content for a provenance event",
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getInputContent(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where the content exists if clustered.",
+ required = false
+ )
@QueryParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The provenance event id.",
+ required = true
+ )
@PathParam("id") LongParameter id) {
// ensure proper input
@@ -291,12 +374,40 @@ public class ProvenanceResource extends ApplicationResource {
* @return The content stream
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Path("/events/{id}/content/output")
@PreAuthorize("hasRole('ROLE_PROVENANCE')")
+ @ApiOperation(
+ value = "Gets the output content for a provenance event",
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getOutputContent(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where the content exists if clustered.",
+ required = false
+ )
@QueryParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The provenance event id.",
+ required = true
+ )
@PathParam("id") LongParameter id) {
// ensure proper input
@@ -374,9 +485,10 @@ public class ProvenanceResource extends ApplicationResource {
* @return A provenanceEntity
*/
@POST
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -456,11 +568,33 @@ public class ProvenanceResource extends ApplicationResource {
@POST
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@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",
+ notes = "Provenance queries may be long running so this endpoint submits a request. The response will include the "
+ + "current state of the query. If the request is not completed the URI in the response can be used at a "
+ + "later time to get the updated state of the query. Once the query has completed the provenance request "
+ + "should be deleted by the client who originally submitted it.",
+ response = ProvenanceEntity.class,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response submitProvenanceRequest(
@Context HttpServletRequest httpServletRequest,
- ProvenanceEntity provenanceEntity) {
+ @ApiParam(
+ value = "The provenance query details.",
+ required = true
+ ) ProvenanceEntity provenanceEntity) {
// check the request
if (provenanceEntity == null) {
@@ -548,13 +682,41 @@ public class ProvenanceResource extends ApplicationResource {
* @return A provenanceEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProvenance(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where this query exists if clustered.",
+ required = false
+ )
@QueryParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The id of the provenance query.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -606,14 +768,42 @@ public class ProvenanceResource extends ApplicationResource {
* @return A provenanceEntity
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response deleteProvenance(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where this query exists if clustered.",
+ required = false
+ )
@QueryParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The id of the provenance query.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -667,13 +857,41 @@ public class ProvenanceResource extends ApplicationResource {
* @return A provenanceEventEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getProvenanceEvent(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where this event exists if clustered.",
+ required = false
+ )
@QueryParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The provenence event id.",
+ required = true
+ )
@PathParam("id") LongParameter id) {
// ensure the id is specified
@@ -738,10 +956,10 @@ public class ProvenanceResource extends ApplicationResource {
* @return A lineageEntity
*/
@POST
+ @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@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,
@@ -803,9 +1021,32 @@ 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",
+ notes = "Lineage queries may be long running so this endpoint submits a request. The response will include the "
+ + "current state of the query. If the request is not completed the URI in the response can be used at a "
+ + "later time to get the updated state of the query. Once the query has completed the lineage request "
+ + "should be deleted by the client who originally submitted it.",
+ response = LineageEntity.class,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response submitLineageRequest(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "The lineage query details.",
+ required = true
+ )
final LineageEntity lineageEntity) {
if (lineageEntity == null || lineageEntity.getLineage() == null || lineageEntity.getLineage().getRequest() == null) {
@@ -898,13 +1139,41 @@ public class ProvenanceResource extends ApplicationResource {
* @return A lineageEntity
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response getLineage(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where this query exists if clustered.",
+ required = false
+ )
@QueryParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The id of the lineage query.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
@@ -954,14 +1223,42 @@ public class ProvenanceResource extends ApplicationResource {
* @return A lineageEntity
*/
@DELETE
+ @Consumes(MediaType.WILDCARD)
@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,
+ authorizations = {
+ @Authorization(value = "Provenance", type = "ROLE_PROVENANCE")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 404, message = "The specified resource could not be found."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
public Response deleteLineage(
@Context HttpServletRequest httpServletRequest,
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "The id of the node where this query exists if clustered.",
+ required = false
+ )
@QueryParam("clusterNodeId") String clusterNodeId,
+ @ApiParam(
+ value = "The id of the lineage query.",
+ required = true
+ )
@PathParam("id") String id) {
// replicate if cluster manager
[11/54] [abbrv] incubator-nifi git commit: NIFI-574: - Removing one
redundant path annotation. - Adjusting default logging due to known warning
about other redundant path annotations that are required due to an issue with
the version of Swagger being use
Posted by ma...@apache.org.
NIFI-574:
- Removing one redundant path annotation.
- Adjusting default logging due to known warning about other redundant path annotations that are required due to an issue with the version of Swagger being used.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/be12203f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/be12203f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/be12203f
Branch: refs/heads/master
Commit: be12203f8f2d455171e2bb18c7fb2b91dc4956d1
Parents: 997ed94
Author: Matt Gilman <ma...@gmail.com>
Authored: Sat May 2 15:18:41 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sat May 2 15:18:41 2015 -0400
----------------------------------------------------------------------
.../nifi-resources/src/main/resources/conf/logback.xml | 3 +++
.../java/org/apache/nifi/web/api/SystemDiagnosticsResource.java | 1 -
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/be12203f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index 42d3353..296169e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -76,6 +76,9 @@
<logger name="com.sun.jersey.spi.container.servlet.WebComponent" level="ERROR"/>
<logger name="com.sun.jersey.spi.spring" level="ERROR"/>
<logger name="org.springframework" level="ERROR"/>
+
+ <!-- Suppress non-error messages due to known warning about redundant path annotation (NIFI-574) -->
+ <logger name="com.sun.jersey.spi.inject.Errors" level="ERROR"/>
<!--
Logger for capturing user events. We do not want to propagate these
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/be12203f/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 fc7636c..5c3c03a 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
@@ -67,7 +67,6 @@ public class SystemDiagnosticsResource extends ApplicationResource {
@GET
@Consumes(MediaType.WILDCARD)
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
- @Path("") // due to a bug in swagger
@PreAuthorize("hasAnyRole('ROLE_MONITOR', 'ROLE_DFM', 'ROLE_ADMIN')")
@ApiOperation(
value = "Gets the diagnostics for the system NiFi is running on",
[08/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
index a696a25..0d0bc06 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/RemoteProcessGroupDetailsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action.component.details;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -29,6 +30,9 @@ public class RemoteProcessGroupDetailsDTO extends ComponentDetailsDTO {
/**
* @return URI of the remote process group
*/
+ @ApiModelProperty(
+ value = "The uri of the target of the remote process group."
+ )
public String getUri() {
return uri;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
index 2239946..7b79bd0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConfigureDetailsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action.details;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -31,6 +32,9 @@ public class ConfigureDetailsDTO extends ActionDetailsDTO {
/**
* @return name of the property that was modified
*/
+ @ApiModelProperty(
+ value = "The name of the property that was modified."
+ )
public String getName() {
return name;
}
@@ -42,6 +46,9 @@ public class ConfigureDetailsDTO extends ActionDetailsDTO {
/**
* @return previous value
*/
+ @ApiModelProperty(
+ value = "The previous value."
+ )
public String getPreviousValue() {
return previousValue;
}
@@ -53,6 +60,9 @@ public class ConfigureDetailsDTO extends ActionDetailsDTO {
/**
* @return new value
*/
+ @ApiModelProperty(
+ value = "The new value."
+ )
public String getValue() {
return value;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
index a6d5d99..db2804f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/ConnectDetailsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action.details;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -35,6 +36,9 @@ public class ConnectDetailsDTO extends ActionDetailsDTO {
/**
* @return id of the source of the connection
*/
+ @ApiModelProperty(
+ value = "The id of the source of the connection."
+ )
public String getSourceId() {
return sourceId;
}
@@ -46,6 +50,9 @@ public class ConnectDetailsDTO extends ActionDetailsDTO {
/**
* @return name of the source of the connection
*/
+ @ApiModelProperty(
+ value = "The name of the source of the connection."
+ )
public String getSourceName() {
return sourceName;
}
@@ -57,6 +64,9 @@ public class ConnectDetailsDTO extends ActionDetailsDTO {
/**
* @return type of the source of the connection
*/
+ @ApiModelProperty(
+ value = "The type of the source of the connection."
+ )
public String getSourceType() {
return sourceType;
}
@@ -68,6 +78,9 @@ public class ConnectDetailsDTO extends ActionDetailsDTO {
/**
* @return name of the relationship that was connected
*/
+ @ApiModelProperty(
+ value = "The name of the relationship that was connected."
+ )
public String getRelationship() {
return relationship;
}
@@ -79,6 +92,9 @@ public class ConnectDetailsDTO extends ActionDetailsDTO {
/**
* @return id of the destination of the connection
*/
+ @ApiModelProperty(
+ value = "The id of the destination of the connection."
+ )
public String getDestinationId() {
return destinationId;
}
@@ -90,6 +106,9 @@ public class ConnectDetailsDTO extends ActionDetailsDTO {
/**
* @return name of the destination of the connection
*/
+ @ApiModelProperty(
+ value = "The name of the destination of the connection."
+ )
public String getDestinationName() {
return destinationName;
}
@@ -101,6 +120,9 @@ public class ConnectDetailsDTO extends ActionDetailsDTO {
/**
* @return type of the destination of the connection
*/
+ @ApiModelProperty(
+ value = "The type of the destination of the connection."
+ )
public String getDestinationType() {
return destinationType;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
index a7f7cf8..f6984a8 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/MoveDetailsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action.details;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -32,6 +33,9 @@ public class MoveDetailsDTO extends ActionDetailsDTO {
/**
* @return id of the group the components previously belonged to
*/
+ @ApiModelProperty(
+ value = "The id of the group the components previously belonged to."
+ )
public String getPreviousGroupId() {
return previousGroupId;
}
@@ -43,6 +47,9 @@ public class MoveDetailsDTO extends ActionDetailsDTO {
/**
* @return name of the group of the components previously belonged to
*/
+ @ApiModelProperty(
+ value = "The name of the group the components previously belonged to."
+ )
public String getPreviousGroup() {
return previousGroup;
}
@@ -54,6 +61,9 @@ public class MoveDetailsDTO extends ActionDetailsDTO {
/**
* @return id of the group the components belong to
*/
+ @ApiModelProperty(
+ value = "The id of the group that components belong to."
+ )
public String getGroupId() {
return groupId;
}
@@ -65,6 +75,9 @@ public class MoveDetailsDTO extends ActionDetailsDTO {
/**
* @return name of the group the components belong to
*/
+ @ApiModelProperty(
+ value = "The name of the group the components belong to."
+ )
public String getGroup() {
return group;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
index 6d5b02f..b83e91d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/details/PurgeDetailsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action.details;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -33,6 +34,9 @@ public class PurgeDetailsDTO extends ActionDetailsDTO {
* @return end date for this purge action
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The end date for the purge action."
+ )
public Date getEndDate() {
return endDate;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
index a9db5d0..8228ac3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/AttributeDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -31,6 +32,9 @@ public class AttributeDTO {
/**
* @return attribute name
*/
+ @ApiModelProperty(
+ value = "The attribute name."
+ )
public String getName() {
return name;
}
@@ -42,6 +46,9 @@ public class AttributeDTO {
/**
* @return attribute value
*/
+ @ApiModelProperty(
+ value = "The attribute value."
+ )
public String getValue() {
return value;
}
@@ -53,6 +60,9 @@ public class AttributeDTO {
/**
* @return value of this attribute before the event took place
*/
+ @ApiModelProperty(
+ value = "The value of the attribute before the event took place."
+ )
public String getPreviousValue() {
return previousValue;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
index 54a5858..e755581 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -45,6 +46,9 @@ public class ProvenanceDTO {
/**
* @return id of this provenance query
*/
+ @ApiModelProperty(
+ value = "The id of the provenance query."
+ )
public String getId() {
return id;
}
@@ -56,6 +60,9 @@ public class ProvenanceDTO {
/**
* @return URI for this query. Used for obtaining the requests at a later time
*/
+ @ApiModelProperty(
+ value = "The URI for this query. Used for obtaining/deleting the request at a later time"
+ )
public String getUri() {
return uri;
}
@@ -67,6 +74,9 @@ public class ProvenanceDTO {
/**
* @return id of the node in the cluster where this provenance originated
*/
+ @ApiModelProperty(
+ value = "The id of the node in the cluster where this provenance originated."
+ )
public String getClusterNodeId() {
return clusterNodeId;
}
@@ -79,6 +89,9 @@ public class ProvenanceDTO {
* @return time the query was submitted
*/
@XmlJavaTypeAdapter(TimestampAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when the query was submitted."
+ )
public Date getSubmissionTime() {
return submissionTime;
}
@@ -91,6 +104,9 @@ public class ProvenanceDTO {
* @return expiration time of the query results
*/
@XmlJavaTypeAdapter(TimestampAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when the query will expire."
+ )
public Date getExpiration() {
return expiration;
}
@@ -102,6 +118,9 @@ public class ProvenanceDTO {
/**
* @return percent completed
*/
+ @ApiModelProperty(
+ value = "The current percent complete."
+ )
public Integer getPercentCompleted() {
return percentCompleted;
}
@@ -113,6 +132,9 @@ public class ProvenanceDTO {
/**
* @return whether the query has finished
*/
+ @ApiModelProperty(
+ value = "Whether the query has finished."
+ )
public Boolean isFinished() {
return finished;
}
@@ -124,6 +146,9 @@ public class ProvenanceDTO {
/**
* @return provenance request
*/
+ @ApiModelProperty(
+ value = "The provenance request."
+ )
public ProvenanceRequestDTO getRequest() {
return request;
}
@@ -135,6 +160,9 @@ public class ProvenanceDTO {
/**
* @return results of this query
*/
+ @ApiModelProperty(
+ value = "The provenance results."
+ )
public ProvenanceResultsDTO getResults() {
return results;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
index 46c1074..dcc1461 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceEventDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -85,6 +86,9 @@ public class ProvenanceEventDTO {
/**
* @return event uuid
*/
+ @ApiModelProperty(
+ value = "The event uuid."
+ )
public String getId() {
return id;
}
@@ -96,6 +100,9 @@ public class ProvenanceEventDTO {
/**
* @return event id
*/
+ @ApiModelProperty(
+ value = "The event id. This is a one up number thats unique per node."
+ )
public Long getEventId() {
return eventId;
}
@@ -108,6 +115,9 @@ public class ProvenanceEventDTO {
* @return time the event occurred
*/
@XmlJavaTypeAdapter(TimestampAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp of the event."
+ )
public Date getEventTime() {
return eventTime;
}
@@ -119,6 +129,9 @@ public class ProvenanceEventDTO {
/**
* @return UUID of the FlowFile for this event
*/
+ @ApiModelProperty(
+ value = "The uuid of the flowfile for the event."
+ )
public String getFlowFileUuid() {
return flowFileUuid;
}
@@ -130,6 +143,9 @@ public class ProvenanceEventDTO {
/**
* @return size of the FlowFile for this event
*/
+ @ApiModelProperty(
+ value = "The size of the flowfile for the event."
+ )
public String getFileSize() {
return fileSize;
}
@@ -141,6 +157,9 @@ public class ProvenanceEventDTO {
/**
* @return size of the FlowFile in bytes for this event
*/
+ @ApiModelProperty(
+ value = "The size of the flowfile in bytes for the event."
+ )
public Long getFileSizeBytes() {
return fileSizeBytes;
}
@@ -152,6 +171,9 @@ public class ProvenanceEventDTO {
/**
* @return type of this event
*/
+ @ApiModelProperty(
+ value = "The type of the event."
+ )
public String getEventType() {
return eventType;
}
@@ -163,6 +185,9 @@ public class ProvenanceEventDTO {
/**
* @return attributes for the FlowFile for this event
*/
+ @ApiModelProperty(
+ value = "The attributes of the flowfile for the event."
+ )
public Collection<AttributeDTO> getAttributes() {
return attributes;
}
@@ -174,6 +199,9 @@ public class ProvenanceEventDTO {
/**
* @return id of the group that this component resides in. If the component is no longer in the flow, the group id will not be set
*/
+ @ApiModelProperty(
+ value = "The id of the group that the component resides in. If the component is no longer in the flow, the group id will not be set."
+ )
public String getGroupId() {
return groupId;
}
@@ -185,6 +213,9 @@ public class ProvenanceEventDTO {
/**
* @return id of the component that generated this event
*/
+ @ApiModelProperty(
+ value = "The id of the component that generated the event."
+ )
public String getComponentId() {
return componentId;
}
@@ -196,6 +227,9 @@ public class ProvenanceEventDTO {
/**
* @return name of the component that generated this event
*/
+ @ApiModelProperty(
+ value = "The name of the component that generated the event."
+ )
public String getComponentName() {
return componentName;
}
@@ -207,6 +241,9 @@ public class ProvenanceEventDTO {
/**
* @return type of the component that generated this event
*/
+ @ApiModelProperty(
+ value = "The type of the component that generated the event."
+ )
public String getComponentType() {
return componentType;
}
@@ -218,6 +255,9 @@ public class ProvenanceEventDTO {
/**
* @return source/destination system URI if the event was a RECEIVE/SEND
*/
+ @ApiModelProperty(
+ value = "The source/destination system uri if the event was a RECEIVE/SEND."
+ )
public String getTransitUri() {
return transitUri;
}
@@ -229,6 +269,9 @@ public class ProvenanceEventDTO {
/**
* @return alternate identifier URI for the FlowFile for this event
*/
+ @ApiModelProperty(
+ value = "The alternate identifier uri for the fileflow for the event."
+ )
public String getAlternateIdentifierUri() {
return alternateIdentifierUri;
}
@@ -240,6 +283,9 @@ public class ProvenanceEventDTO {
/**
* @return identifier of the node where this event originated
*/
+ @ApiModelProperty(
+ value = "The identifier for the node where the event originated."
+ )
public String getClusterNodeId() {
return clusterNodeId;
}
@@ -251,6 +297,9 @@ public class ProvenanceEventDTO {
/**
* @return label to use to show which node this event originated from
*/
+ @ApiModelProperty(
+ value = "The label for the node where the event originated."
+ )
public String getClusterNodeAddress() {
return clusterNodeAddress;
}
@@ -262,6 +311,9 @@ public class ProvenanceEventDTO {
/**
* @return parent uuids for this event
*/
+ @ApiModelProperty(
+ value = "The parent uuids for the event."
+ )
public List<String> getParentUuids() {
return parentUuids;
}
@@ -273,6 +325,9 @@ public class ProvenanceEventDTO {
/**
* @return child uuids for this event
*/
+ @ApiModelProperty(
+ value = "The child uuids for the event."
+ )
public List<String> getChildUuids() {
return childUuids;
}
@@ -284,6 +339,9 @@ public class ProvenanceEventDTO {
/**
* @return duration of the event, in milliseconds
*/
+ @ApiModelProperty(
+ value = "The event duration in milliseconds."
+ )
public Long getEventDuration() {
return eventDuration;
}
@@ -295,6 +353,9 @@ public class ProvenanceEventDTO {
/**
* @return duration since the lineage began, in milliseconds
*/
+ @ApiModelProperty(
+ value = "The duration since the lineage began, in milliseconds."
+ )
public Long getLineageDuration() {
return lineageDuration;
}
@@ -306,6 +367,9 @@ public class ProvenanceEventDTO {
/**
* @return source system FlowFile id
*/
+ @ApiModelProperty(
+ value = "The source system flowfile id."
+ )
public String getSourceSystemFlowFileId() {
return sourceSystemFlowFileId;
}
@@ -317,6 +381,9 @@ public class ProvenanceEventDTO {
/**
* @return If this represents a route event, this is the relationship to which the flowfile was routed
*/
+ @ApiModelProperty(
+ value = "The relationship to which the flowfile was routed if the event is of type ROUTE."
+ )
public String getRelationship() {
return relationship;
}
@@ -328,6 +395,9 @@ public class ProvenanceEventDTO {
/**
* @return event details
*/
+ @ApiModelProperty(
+ value = "The event details."
+ )
public String getDetails() {
return details;
}
@@ -339,6 +409,9 @@ public class ProvenanceEventDTO {
/**
* @return whether or not the input and output content claim is the same
*/
+ @ApiModelProperty(
+ value = "Whether the input and output content claim is the same."
+ )
public Boolean getContentEqual() {
return contentEqual;
}
@@ -350,6 +423,9 @@ public class ProvenanceEventDTO {
/**
* @return whether or not the output content is still available
*/
+ @ApiModelProperty(
+ value = "Whether the output content is still available."
+ )
public Boolean getOutputContentAvailable() {
return outputContentAvailable;
}
@@ -361,6 +437,9 @@ public class ProvenanceEventDTO {
/**
* @return the Section in which the output Content Claim lives, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The section in which the output content claim lives."
+ )
public String getOutputContentClaimSection() {
return outputContentClaimSection;
}
@@ -372,6 +451,9 @@ public class ProvenanceEventDTO {
/**
* @return the Container in which the output Content Claim lives, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The container in which the output content claim lives."
+ )
public String getOutputContentClaimContainer() {
return outputContentClaimContainer;
}
@@ -383,6 +465,9 @@ public class ProvenanceEventDTO {
/**
* @return the Identifier of the output Content Claim, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The identifier of the output content claim."
+ )
public String getOutputContentClaimIdentifier() {
return outputContentClaimIdentifier;
}
@@ -394,6 +479,9 @@ public class ProvenanceEventDTO {
/**
* @return the offset into the the output Content Claim where the FlowFile's content begins, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The offset into the output content claim where the flowfiles content begins."
+ )
public Long getOutputContentClaimOffset() {
return outputContentClaimOffset;
}
@@ -405,6 +493,9 @@ public class ProvenanceEventDTO {
/**
* @return the formatted file size of the input content claim
*/
+ @ApiModelProperty(
+ value = "The file size of the output content claim formatted."
+ )
public String getOutputContentClaimFileSize() {
return outputContentClaimFileSize;
}
@@ -416,6 +507,9 @@ public class ProvenanceEventDTO {
/**
* @return the number of bytes of the input content claim
*/
+ @ApiModelProperty(
+ value = "The file size of the output content claim in bytes."
+ )
public Long getOutputContentClaimFileSizeBytes() {
return outputContentClaimFileSizeBytes;
}
@@ -427,6 +521,9 @@ public class ProvenanceEventDTO {
/**
* @return whether or not the input content is still available
*/
+ @ApiModelProperty(
+ value = "Whether the input content is still available."
+ )
public Boolean getInputContentAvailable() {
return inputContentAvailable;
}
@@ -438,6 +535,9 @@ public class ProvenanceEventDTO {
/**
* @return the Section in which the input Content Claim lives, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The section in which the input content claim lives."
+ )
public String getInputContentClaimSection() {
return inputContentClaimSection;
}
@@ -449,6 +549,9 @@ public class ProvenanceEventDTO {
/**
* @return the Container in which the input Content Claim lives, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The container in which the input content claim lives."
+ )
public String getInputContentClaimContainer() {
return inputContentClaimContainer;
}
@@ -460,6 +563,9 @@ public class ProvenanceEventDTO {
/**
* @return the Identifier of the input Content Claim, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The identifier of the input content claim."
+ )
public String getInputContentClaimIdentifier() {
return inputContentClaimIdentifier;
}
@@ -471,6 +577,9 @@ public class ProvenanceEventDTO {
/**
* @return the offset into the the input Content Claim where the FlowFile's content begins, or <code>null</code> if no Content Claim exists
*/
+ @ApiModelProperty(
+ value = "The offset into the input content claim where the flowfiles content begins."
+ )
public Long getInputContentClaimOffset() {
return inputContentClaimOffset;
}
@@ -482,6 +591,9 @@ public class ProvenanceEventDTO {
/**
* @return the formatted file size of the input content claim
*/
+ @ApiModelProperty(
+ value = "The file size of the input content claim formatted."
+ )
public String getInputContentClaimFileSize() {
return inputContentClaimFileSize;
}
@@ -493,6 +605,9 @@ public class ProvenanceEventDTO {
/**
* @return the number of bytes of the input content claim
*/
+ @ApiModelProperty(
+ value = "The file size of the intput content claim in bytes."
+ )
public Long getInputContentClaimFileSizeBytes() {
return inputContentClaimFileSizeBytes;
}
@@ -504,6 +619,9 @@ public class ProvenanceEventDTO {
/**
* @return whether or not replay is available
*/
+ @ApiModelProperty(
+ value = "Whether or not replay is available."
+ )
public Boolean getReplayAvailable() {
return replayAvailable;
}
@@ -515,6 +633,9 @@ public class ProvenanceEventDTO {
/**
* @return the explanation as to why replay is unavailable
*/
+ @ApiModelProperty(
+ value = "Explanation as to why replay is unavailable."
+ )
public String getReplayExplanation() {
return replayExplanation;
}
@@ -527,6 +648,10 @@ public class ProvenanceEventDTO {
* @return identifier of the FlowFile Queue / Connection from which the FlowFile was pulled to generate this event, or <code>null</code> if either the queue is unknown or the FlowFile was created
* by this event
*/
+ @ApiModelProperty(
+ value = "The identifier of the queue/connection from which the flowfile was pulled to genereate this event. May be null if the queue/connection is unknown or the "
+ + "flowfile was generated from this event."
+ )
public String getSourceConnectionIdentifier() {
return sourceConnectionIdentifier;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java
index 2c7f467..edd414f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceOptionsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -30,6 +31,9 @@ public class ProvenanceOptionsDTO {
/**
* @return available searchable fields for this NiFi instance
*/
+ @ApiModelProperty(
+ value = "The available searchable field for the NiFi."
+ )
public List<ProvenanceSearchableFieldDTO> getSearchableFields() {
return searchableFields;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java
index bc239ee..f38bc99 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceRequestDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.Map;
@@ -39,6 +40,9 @@ public class ProvenanceRequestDTO {
/**
* @return the search terms to use for this search
*/
+ @ApiModelProperty(
+ value = "The search terms used to perform the search."
+ )
public Map<String, String> getSearchTerms() {
return searchTerms;
}
@@ -51,6 +55,9 @@ public class ProvenanceRequestDTO {
* @return earliest event time to include in the query
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The earliest event time to include in the query."
+ )
public Date getStartDate() {
return startDate;
}
@@ -63,6 +70,9 @@ public class ProvenanceRequestDTO {
* @return latest event time to include in the query
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The latest event time to include in the query."
+ )
public Date getEndDate() {
return endDate;
}
@@ -74,6 +84,9 @@ public class ProvenanceRequestDTO {
/**
* @return minimum file size to include in the query
*/
+ @ApiModelProperty(
+ value = "The minimum file size to include in the query."
+ )
public String getMinimumFileSize() {
return minimumFileSize;
}
@@ -85,6 +98,9 @@ public class ProvenanceRequestDTO {
/**
* @return maximum file size to include in the query
*/
+ @ApiModelProperty(
+ value = "The maximum file size to include in the query."
+ )
public String getMaximumFileSize() {
return maximumFileSize;
}
@@ -96,6 +112,9 @@ public class ProvenanceRequestDTO {
/**
* @return number of max results
*/
+ @ApiModelProperty(
+ value = "The maximum number of results to include."
+ )
public Integer getMaxResults() {
return maxResults;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java
index 6d2f64d..d37452d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceResultsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import org.apache.nifi.web.api.dto.util.DateTimeAdapter;
import org.apache.nifi.web.api.dto.util.TimeAdapter;
@@ -43,6 +44,9 @@ public class ProvenanceResultsDTO {
/**
* @return error messages
*/
+ @ApiModelProperty(
+ value = "Any errors that occurred while performing the provenance request."
+ )
public Set<String> getErrors() {
return errors;
}
@@ -54,6 +58,9 @@ public class ProvenanceResultsDTO {
/**
* @return provenance events that matched the search criteria
*/
+ @ApiModelProperty(
+ value = "The provenance events that matched the search criteria."
+ )
public List<ProvenanceEventDTO> getProvenanceEvents() {
return provenanceEvents;
}
@@ -65,6 +72,9 @@ public class ProvenanceResultsDTO {
/**
* @return total number of results formatted
*/
+ @ApiModelProperty(
+ value = "The total number of results formatted."
+ )
public String getTotal() {
return total;
}
@@ -76,6 +86,9 @@ public class ProvenanceResultsDTO {
/**
* @return total number of results
*/
+ @ApiModelProperty(
+ value = "The total number of results."
+ )
public Long getTotalCount() {
return totalCount;
}
@@ -88,6 +101,9 @@ public class ProvenanceResultsDTO {
* @return when the search was performed
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "Then the search was performed."
+ )
public Date getGenerated() {
return generated;
}
@@ -100,6 +116,9 @@ public class ProvenanceResultsDTO {
* @return oldest event available in the provenance repository
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The oldest event available in the provenance repository."
+ )
public Date getOldestEvent() {
return oldestEvent;
}
@@ -111,6 +130,9 @@ public class ProvenanceResultsDTO {
/**
* @return time offset on the server thats used for event time
*/
+ @ApiModelProperty(
+ value = "The time offset of the server that's used for event time."
+ )
public Integer getTimeOffset() {
return timeOffset;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java
index 97300f6..05a707e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/ProvenanceSearchableFieldDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -32,6 +33,9 @@ public class ProvenanceSearchableFieldDTO {
/**
* @return id of this searchable field
*/
+ @ApiModelProperty(
+ value = "The id of the searchable field."
+ )
public String getId() {
return id;
}
@@ -43,6 +47,9 @@ public class ProvenanceSearchableFieldDTO {
/**
* @return the field
*/
+ @ApiModelProperty(
+ value = "The searchable field."
+ )
public String getField() {
return field;
}
@@ -54,6 +61,9 @@ public class ProvenanceSearchableFieldDTO {
/**
* @return label for this field
*/
+ @ApiModelProperty(
+ value = "The label for the searchable field."
+ )
public String getLabel() {
return label;
}
@@ -65,6 +75,9 @@ public class ProvenanceSearchableFieldDTO {
/**
* @return type of this field
*/
+ @ApiModelProperty(
+ value = "The type of the searchable field."
+ )
public String getType() {
return type;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java
index 0ef8aab..bc68d78 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance.lineage;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -42,6 +43,9 @@ public class LineageDTO {
/**
* @return id of this lineage
*/
+ @ApiModelProperty(
+ value = "The id of this lineage query."
+ )
public String getId() {
return id;
}
@@ -53,6 +57,9 @@ public class LineageDTO {
/**
* @return uri for this lineage
*/
+ @ApiModelProperty(
+ value = "The URI for this lineage query for later retrieval and deletion."
+ )
public String getUri() {
return uri;
}
@@ -64,6 +71,9 @@ public class LineageDTO {
/**
* @return id of the node in the cluster where this lineage originated
*/
+ @ApiModelProperty(
+ value = "The id of the node where this lineage originated if clustered."
+ )
public String getClusterNodeId() {
return clusterNodeId;
}
@@ -76,6 +86,9 @@ public class LineageDTO {
* @return submission time for this lineage
*/
@XmlJavaTypeAdapter(TimestampAdapter.class)
+ @ApiModelProperty(
+ value = "When the lineage query was submitted."
+ )
public Date getSubmissionTime() {
return submissionTime;
}
@@ -88,6 +101,9 @@ public class LineageDTO {
* @return expiration of this lineage
*/
@XmlJavaTypeAdapter(TimestampAdapter.class)
+ @ApiModelProperty(
+ value = "When the lineage query will expire."
+ )
public Date getExpiration() {
return expiration;
}
@@ -99,6 +115,9 @@ public class LineageDTO {
/**
* @return percent completed for this result
*/
+ @ApiModelProperty(
+ value = "The percent complete for the lineage query."
+ )
public Integer getPercentCompleted() {
return percentCompleted;
}
@@ -110,6 +129,9 @@ public class LineageDTO {
/**
* @return whether or not the request is finished running
*/
+ @ApiModelProperty(
+ value = "Whether the lineage query has finished."
+ )
public Boolean getFinished() {
return finished;
}
@@ -121,6 +143,9 @@ public class LineageDTO {
/**
* @return the lineage request
*/
+ @ApiModelProperty(
+ value = "The initial lineage result."
+ )
public LineageRequestDTO getRequest() {
return request;
}
@@ -132,6 +157,9 @@ public class LineageDTO {
/**
* @return the results of this lineage
*/
+ @ApiModelProperty(
+ value = "The results of the lineage query."
+ )
public LineageResultsDTO getResults() {
return results;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java
index 2494962..afab621 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageRequestDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance.lineage;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlType;
@@ -31,7 +32,6 @@ public class LineageRequestDTO {
@XmlType(name = "lineageRequestType")
@XmlEnum
public enum LineageRequestType {
-
PARENTS,
CHILDREN,
FLOWFILE;
@@ -45,6 +45,9 @@ public class LineageRequestDTO {
/**
* @return event id that was used to generate this lineage
*/
+ @ApiModelProperty(
+ value = ""
+ )
public Long getEventId() {
return eventId;
}
@@ -57,6 +60,11 @@ public class LineageRequestDTO {
* @return type of lineage request. Either 'PARENTS', 'CHILDREN', or 'FLOWFILE'. PARENTS will return the lineage for the flowfiles that are parents of the specified event. CHILDREN will return the
* lineage of for the flowfiles that are children of the specified event. FLOWFILE will return the lineage for the specified flowfile.
*/
+ @ApiModelProperty(
+ value = "The type of lineage request. PARENTS will return the lineage for the flowfiles that are parents of the specified event. CHILDREN will return the lineage "
+ + "for the flowfiles that are children of the specified event. FLOWFILE will return the lineage for the specified flowfile.",
+ allowableValues = "PARENTS, CHILDREN, and FLOWFILE"
+ )
public LineageRequestType getLineageRequestType() {
return lineageRequestType;
}
@@ -68,6 +76,9 @@ public class LineageRequestDTO {
/**
* @return uuid that was used to generate this lineage
*/
+ @ApiModelProperty(
+ value = "The uuid that was used to generate the lineage."
+ )
public String getUuid() {
return uuid;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java
index 8876e9e..0ac4479 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/LineageResultsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance.lineage;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -34,6 +35,9 @@ public class LineageResultsDTO {
/**
* @return any error messages
*/
+ @ApiModelProperty(
+ value = "Any errors that occurred while generating the lineage."
+ )
public Set<String> getErrors() {
return errors;
}
@@ -45,6 +49,9 @@ public class LineageResultsDTO {
/**
* @return the nodes
*/
+ @ApiModelProperty(
+ value = "The nodes in the lineage."
+ )
public List<ProvenanceNodeDTO> getNodes() {
return nodes;
}
@@ -56,6 +63,9 @@ public class LineageResultsDTO {
/**
* @return the links
*/
+ @ApiModelProperty(
+ value = "The links between the nodes in the lineage."
+ )
public List<ProvenanceLinkDTO> getLinks() {
return links;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java
index d002626..f91d124 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceLinkDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance.lineage;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -36,6 +37,9 @@ public class ProvenanceLinkDTO {
/**
* @return source node id
*/
+ @ApiModelProperty(
+ value = "The source node id of the link."
+ )
public String getSourceId() {
return sourceId;
}
@@ -47,6 +51,9 @@ public class ProvenanceLinkDTO {
/**
* @return target node id
*/
+ @ApiModelProperty(
+ value = "The target node id of the link."
+ )
public String getTargetId() {
return targetId;
}
@@ -58,6 +65,9 @@ public class ProvenanceLinkDTO {
/**
* @return flowfile uuid that traversed this link
*/
+ @ApiModelProperty(
+ value = "The flowfile uuid that traversed the link."
+ )
public String getFlowFileUuid() {
return flowFileUuid;
}
@@ -70,6 +80,9 @@ public class ProvenanceLinkDTO {
* @return timestamp of this link (based on the destination)
*/
@XmlJavaTypeAdapter(TimestampAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp of the link (based on the destination)."
+ )
public Date getTimestamp() {
return timestamp;
}
@@ -81,6 +94,9 @@ public class ProvenanceLinkDTO {
/**
* @return number of millis since epoch
*/
+ @ApiModelProperty(
+ value = "The timestamp of this link in milliseconds."
+ )
public Long getMillis() {
return millis;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
index b517751..5e7e329 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/provenance/lineage/ProvenanceNodeDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.provenance.lineage;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.List;
@@ -43,6 +44,9 @@ public class ProvenanceNodeDTO {
/**
* @return id of the node
*/
+ @ApiModelProperty(
+ value = "The id of the node."
+ )
public String getId() {
return id;
}
@@ -54,6 +58,9 @@ public class ProvenanceNodeDTO {
/**
* @return flowfile uuid for this provenance event
*/
+ @ApiModelProperty(
+ value = "The uuid of the flowfile associated with the provenance event."
+ )
public String getFlowFileUuid() {
return flowFileUuid;
}
@@ -65,6 +72,9 @@ public class ProvenanceNodeDTO {
/**
* @return parent flowfile uuids for this provenance event
*/
+ @ApiModelProperty(
+ value = "The uuid of the parent flowfiles of the provenance event."
+ )
public List<String> getParentUuids() {
return parentUuids;
}
@@ -76,6 +86,9 @@ public class ProvenanceNodeDTO {
/**
* @return child flowfile uuids for this provenance event
*/
+ @ApiModelProperty(
+ value = "The uuid of the childrent flowfiles of the provenance event."
+ )
public List<String> getChildUuids() {
return childUuids;
}
@@ -87,6 +100,9 @@ public class ProvenanceNodeDTO {
/**
* @return node identifier that this event/flowfile originated from
*/
+ @ApiModelProperty(
+ value = "The identifier of the node that this event/flowfile originated from."
+ )
public String getClusterNodeIdentifier() {
return clusterNodeIdentifier;
}
@@ -98,6 +114,10 @@ public class ProvenanceNodeDTO {
/**
* @return type of node
*/
+ @ApiModelProperty(
+ value = "The type of the node.",
+ allowableValues = "FLOWFILE, EVENT"
+ )
public String getType() {
return type;
}
@@ -109,6 +129,9 @@ public class ProvenanceNodeDTO {
/**
* @return this is an event node, this is the type of event
*/
+ @ApiModelProperty(
+ value = "If the type is EVENT, this is the type of event."
+ )
public String getEventType() {
return eventType;
}
@@ -121,6 +144,9 @@ public class ProvenanceNodeDTO {
* @return timestamp of this node
*/
@XmlJavaTypeAdapter(TimestampAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp of the node formatted."
+ )
public Date getTimestamp() {
return timestamp;
}
@@ -132,6 +158,9 @@ public class ProvenanceNodeDTO {
/**
* @return number of millis since epoch
*/
+ @ApiModelProperty(
+ value = "The timestamp of the node in milliseconds."
+ )
public Long getMillis() {
return millis;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java
index 01965f9..8e9cba5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/ComponentSearchResultDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.search;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -33,6 +34,9 @@ public class ComponentSearchResultDTO {
/**
* @return id of the component that matched
*/
+ @ApiModelProperty(
+ value = "The id of the component that matched the search."
+ )
public String getId() {
return id;
}
@@ -44,6 +48,9 @@ public class ComponentSearchResultDTO {
/**
* @return group id of the component that matched
*/
+ @ApiModelProperty(
+ value = "The group id of the component that matched the search."
+ )
public String getGroupId() {
return groupId;
}
@@ -55,6 +62,9 @@ public class ComponentSearchResultDTO {
/**
* @return name of the component that matched
*/
+ @ApiModelProperty(
+ value = "The name of the component that matched the search."
+ )
public String getName() {
return name;
}
@@ -66,6 +76,9 @@ public class ComponentSearchResultDTO {
/**
* @return What matched the search string for this component
*/
+ @ApiModelProperty(
+ value = "What matched the search from the component."
+ )
public List<String> getMatches() {
return matches;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java
index ab78d06..554966e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/NodeSearchResultDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.search;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -30,6 +31,9 @@ public class NodeSearchResultDTO {
/**
* @return id of the node that was matched
*/
+ @ApiModelProperty(
+ value = "The id of the node that matched the search."
+ )
public String getId() {
return id;
}
@@ -41,6 +45,9 @@ public class NodeSearchResultDTO {
/**
* @return address of the node that was matched
*/
+ @ApiModelProperty(
+ value = "The address of the node that matched the search."
+ )
public String getAddress() {
return address;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java
index 0319916..60e5bdd 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/SearchResultsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.search;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -37,6 +38,9 @@ public class SearchResultsDTO {
/**
* @return The processors that matched the search
*/
+ @ApiModelProperty(
+ value = "The processors that matched the search."
+ )
public List<ComponentSearchResultDTO> getProcessorResults() {
return processorResults;
}
@@ -48,6 +52,9 @@ public class SearchResultsDTO {
/**
* @return connections that matched the search
*/
+ @ApiModelProperty(
+ value = "The connections that matched the search."
+ )
public List<ComponentSearchResultDTO> getConnectionResults() {
return connectionResults;
}
@@ -59,6 +66,9 @@ public class SearchResultsDTO {
/**
* @return process group that matched the search
*/
+ @ApiModelProperty(
+ value = "The process groups that matched the search."
+ )
public List<ComponentSearchResultDTO> getProcessGroupResults() {
return processGroupResults;
}
@@ -70,6 +80,9 @@ public class SearchResultsDTO {
/**
* @return input ports that matched the search
*/
+ @ApiModelProperty(
+ value = "The input ports that matched the search."
+ )
public List<ComponentSearchResultDTO> getInputPortResults() {
return inputPortResults;
}
@@ -77,6 +90,9 @@ public class SearchResultsDTO {
/**
* @return output ports that matched the search
*/
+ @ApiModelProperty(
+ value = "The output ports that matched the search."
+ )
public List<ComponentSearchResultDTO> getOutputPortResults() {
return outputPortResults;
}
@@ -92,6 +108,9 @@ public class SearchResultsDTO {
/**
* @return remote process groups that matched the search
*/
+ @ApiModelProperty(
+ value = "The remote process groups that matched the search."
+ )
public List<ComponentSearchResultDTO> getRemoteProcessGroupResults() {
return remoteProcessGroupResults;
}
@@ -103,6 +122,9 @@ public class SearchResultsDTO {
/**
* @return funnels that matched the search
*/
+ @ApiModelProperty(
+ value = "The funnels that matched the search."
+ )
public List<ComponentSearchResultDTO> getFunnelResults() {
return funnelResults;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java
index 863ba3a..ef81b88 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserGroupSearchResultDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.search;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -29,6 +30,9 @@ public class UserGroupSearchResultDTO {
/**
* @return name of the group that matched
*/
+ @ApiModelProperty(
+ value = "The name of the group that matched the search."
+ )
public String getGroup() {
return group;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java
index b68ab0f..8bed771 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/search/UserSearchResultDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.search;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -30,6 +31,9 @@ public class UserSearchResultDTO {
/**
* @return dn of the user that matched
*/
+ @ApiModelProperty(
+ value = "The dn of the user that matched the search."
+ )
public String getUserDn() {
return userDn;
}
@@ -41,6 +45,9 @@ public class UserSearchResultDTO {
/**
* @return username of user that matched
*/
+ @ApiModelProperty(
+ value = "The name of the user that matched the search."
+ )
public String getUserName() {
return userName;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java
index 248729e..34f900f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterConnectionStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -37,6 +38,9 @@ public class ClusterConnectionStatusDTO {
* @return time the status were last refreshed
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time the status was last refreshed."
+ )
public Date getStatsLastRefreshed() {
return statsLastRefreshed;
}
@@ -48,6 +52,9 @@ public class ClusterConnectionStatusDTO {
/**
* @return connection id
*/
+ @ApiModelProperty(
+ value = "The id of the connection."
+ )
public String getConnectionId() {
return connectionId;
}
@@ -59,6 +66,9 @@ public class ClusterConnectionStatusDTO {
/**
* @return connection name
*/
+ @ApiModelProperty(
+ value = "The name of the connection."
+ )
public String getConnectionName() {
return connectionName;
}
@@ -70,6 +80,9 @@ public class ClusterConnectionStatusDTO {
/**
* @return The collection of node connection status DTO
*/
+ @ApiModelProperty(
+ value = "The connection status for each node."
+ )
public Collection<NodeConnectionStatusDTO> getNodeConnectionStatus() {
return nodeConnectionStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java
index ca4ef07..372bb70 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterPortStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -37,6 +38,9 @@ public class ClusterPortStatusDTO {
* @return the time the status were last refreshed
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time the status was last refreshed."
+ )
public Date getStatsLastRefreshed() {
return statsLastRefreshed;
}
@@ -48,6 +52,9 @@ public class ClusterPortStatusDTO {
/**
* @return port status from each node in the cluster
*/
+ @ApiModelProperty(
+ value = "The port status for each node."
+ )
public Collection<NodePortStatusDTO> getNodePortStatus() {
return nodePortStatus;
}
@@ -59,6 +66,9 @@ public class ClusterPortStatusDTO {
/**
* @return port id
*/
+ @ApiModelProperty(
+ value = "The id of the port."
+ )
public String getPortId() {
return portId;
}
@@ -70,6 +80,9 @@ public class ClusterPortStatusDTO {
/**
* @return port name
*/
+ @ApiModelProperty(
+ value = "The name of the port."
+ )
public String getPortName() {
return portName;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessGroupStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessGroupStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessGroupStatusDTO.java
index 08d76a5..1a4ad63 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessGroupStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessGroupStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -39,6 +40,9 @@ public class ClusterProcessGroupStatusDTO {
* @return The time the status were last refreshed
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time when the stats was last refreshed."
+ )
public Date getStatsLastRefreshed() {
return statsLastRefreshed;
}
@@ -52,6 +56,9 @@ public class ClusterProcessGroupStatusDTO {
*
* @return The process group id
*/
+ @ApiModelProperty(
+ value = "The id of the process group."
+ )
public String getProcessGroupId() {
return processGroupId;
}
@@ -65,6 +72,9 @@ public class ClusterProcessGroupStatusDTO {
*
* @return The process group name
*/
+ @ApiModelProperty(
+ value = "The name of the process group."
+ )
public String getProcessGroupName() {
return processGroupName;
}
@@ -78,6 +88,9 @@ public class ClusterProcessGroupStatusDTO {
*
* @return The collection of node process group status DTO
*/
+ @ApiModelProperty(
+ value = "The process groups status for each node."
+ )
public Collection<NodeProcessGroupStatusDTO> getNodeProcessGroupStatus() {
return nodeProcessGroupStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java
index 8d78b1f..faedc57 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterProcessorStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -39,6 +40,9 @@ public class ClusterProcessorStatusDTO {
* @return time the status were last refreshed
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time when the status was last refreshed."
+ )
public Date getStatsLastRefreshed() {
return statsLastRefreshed;
}
@@ -50,6 +54,9 @@ public class ClusterProcessorStatusDTO {
/**
* @return processor id
*/
+ @ApiModelProperty(
+ value = "The processor id."
+ )
public String getProcessorId() {
return processorId;
}
@@ -61,6 +68,9 @@ public class ClusterProcessorStatusDTO {
/**
* @return processor name
*/
+ @ApiModelProperty(
+ value = "The processor name."
+ )
public String getProcessorName() {
return processorName;
}
@@ -72,6 +82,9 @@ public class ClusterProcessorStatusDTO {
/**
* @return processor type
*/
+ @ApiModelProperty(
+ value = "The processor type."
+ )
public String getProcessorType() {
return processorType;
}
@@ -83,6 +96,10 @@ public class ClusterProcessorStatusDTO {
/**
* @return processor run status
*/
+ @ApiModelProperty(
+ value = "The processor state.",
+ allowableValues = "RUNNING, STOPPED, DISABLED, INVALID"
+ )
public String getProcessorRunStatus() {
return processorRunStatus;
}
@@ -96,6 +113,9 @@ public class ClusterProcessorStatusDTO {
*
* @return The collection of node processor status DTO
*/
+ @ApiModelProperty(
+ value = "The processor status for each node."
+ )
public Collection<NodeProcessorStatusDTO> getNodeProcessorStatus() {
return nodeProcessorStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java
index 027bf4f..5fef96f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterRemoteProcessGroupStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -37,6 +38,9 @@ public class ClusterRemoteProcessGroupStatusDTO {
* @return the time the status were last refreshed
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time when the remote process group status was last refreshed."
+ )
public Date getStatsLastRefreshed() {
return statsLastRefreshed;
}
@@ -48,6 +52,9 @@ public class ClusterRemoteProcessGroupStatusDTO {
/**
* @return remote process group status from each node in the cluster
*/
+ @ApiModelProperty(
+ value = "The remote process group status from each node in the cluster."
+ )
public Collection<NodeRemoteProcessGroupStatusDTO> getNodeRemoteProcessGroupStatus() {
return nodeRemoteProcessGroupStatus;
}
@@ -59,6 +66,9 @@ public class ClusterRemoteProcessGroupStatusDTO {
/**
* @return remote process group id
*/
+ @ApiModelProperty(
+ value = "The id of the remote process group."
+ )
public String getRemoteProcessGroupId() {
return remoteProcessGroupId;
}
@@ -70,6 +80,9 @@ public class ClusterRemoteProcessGroupStatusDTO {
/**
* @return remote process group name
*/
+ @ApiModelProperty(
+ value = "The name of the remote process group."
+ )
public String getRemoteProcessGroupName() {
return remoteProcessGroupName;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java
index e170c8b..73529d0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import javax.xml.bind.annotation.XmlType;
@@ -31,6 +32,9 @@ public class ClusterStatusDTO {
/**
* @return collection of the node status DTOs
*/
+ @ApiModelProperty(
+ value = "The status of each node."
+ )
public Collection<NodeStatusDTO> getNodeStatus() {
return nodeStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java
index a22c872..997e24b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ClusterStatusHistoryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -36,6 +37,9 @@ public class ClusterStatusHistoryDTO {
* @return when this status history was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "When the status history was generated."
+ )
public Date getGenerated() {
return generated;
}
@@ -47,6 +51,9 @@ public class ClusterStatusHistoryDTO {
/**
* @return status history from each node in the cluster
*/
+ @ApiModelProperty(
+ value = "The status history from each node."
+ )
public Collection<NodeStatusHistoryDTO> getNodeStatusHistory() {
return nodeStatusHistory;
}
@@ -58,6 +65,9 @@ public class ClusterStatusHistoryDTO {
/**
* @return status history for this component across the entire cluster
*/
+ @ApiModelProperty(
+ value = "The status history for the entire cluster."
+ )
public StatusHistoryDTO getClusterStatusHistory() {
return clusterStatusHistory;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
index 2abc6ff..dc17c21 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ConnectionStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -42,6 +43,9 @@ public class ConnectionStatusDTO {
/**
* @return The connection id
*/
+ @ApiModelProperty(
+ value = "The id of the connection."
+ )
public String getId() {
return id;
}
@@ -51,8 +55,11 @@ public class ConnectionStatusDTO {
}
/**
- * @return the ID of the Process Group to which this processor belongs.
+ * @return the ID of the Process Group to which this connection belongs.
*/
+ @ApiModelProperty(
+ value = "The id of the process group the connection belongs to."
+ )
public String getGroupId() {
return groupId;
}
@@ -64,6 +71,9 @@ public class ConnectionStatusDTO {
/**
* @return name of this connection
*/
+ @ApiModelProperty(
+ value = "The name of the connection."
+ )
public String getName() {
return name;
}
@@ -75,6 +85,9 @@ public class ConnectionStatusDTO {
/**
* @return total count of flow files that are queued
*/
+ @ApiModelProperty(
+ value = "The number of flowfiles that are queued."
+ )
public String getQueuedCount() {
return queuedCount;
}
@@ -86,6 +99,9 @@ public class ConnectionStatusDTO {
/**
* @return total size of flow files that are queued
*/
+ @ApiModelProperty(
+ value = "The total size of flowfiles that are queued formatted."
+ )
public String getQueuedSize() {
return queuedSize;
}
@@ -97,6 +113,9 @@ public class ConnectionStatusDTO {
/**
* @return The total count and size of queued flow files
*/
+ @ApiModelProperty(
+ value = "The total count and size of queued flowfiles formatted."
+ )
public String getQueued() {
return queued;
}
@@ -108,6 +127,9 @@ public class ConnectionStatusDTO {
/**
* @return id of the source of this connection
*/
+ @ApiModelProperty(
+ value = "The id of the source of the connection."
+ )
public String getSourceId() {
return sourceId;
}
@@ -119,6 +141,9 @@ public class ConnectionStatusDTO {
/**
* @return name of the source of this connection
*/
+ @ApiModelProperty(
+ value = "The name of the source of the connection."
+ )
public String getSourceName() {
return sourceName;
}
@@ -130,6 +155,9 @@ public class ConnectionStatusDTO {
/**
* @return id of the destination of this connection
*/
+ @ApiModelProperty(
+ value = "The id of the destination of the connection."
+ )
public String getDestinationId() {
return destinationId;
}
@@ -141,6 +169,9 @@ public class ConnectionStatusDTO {
/**
* @return name of the destination of this connection
*/
+ @ApiModelProperty(
+ value = "The name of the destination of the connection."
+ )
public String getDestinationName() {
return destinationName;
}
@@ -152,6 +183,9 @@ public class ConnectionStatusDTO {
/**
* @return input for this connection
*/
+ @ApiModelProperty(
+ value = "The input count/size for the connection in the last 5 minutes."
+ )
public String getInput() {
return input;
}
@@ -163,6 +197,9 @@ public class ConnectionStatusDTO {
/**
* @return output for this connection
*/
+ @ApiModelProperty(
+ value = "The output count/sie for the connection in the last 5 minutes."
+ )
public String getOutput() {
return output;
}
[28/54] [abbrv] incubator-nifi git commit: NIFI-429: Fixed typo in pom
Posted by ma...@apache.org.
NIFI-429: Fixed typo in pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3472bf3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3472bf3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3472bf3f
Branch: refs/heads/master
Commit: 3472bf3f52c875c38a0dc97645f99c909a4ac304
Parents: 41b21af
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue May 5 13:58:18 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue May 5 13:58:18 2015 -0400
----------------------------------------------------------------------
nifi-nar-maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3472bf3f/nifi-nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index 765cbdf..95cee00 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -38,7 +38,7 @@
<goal>perform</goal>
</goals>
<configuration>
- <pomFileName>nar-maven-plugin/pom.xml</pomFileName>
+ <pomFileName>nifi-nar-maven-plugin/pom.xml</pomFileName>
</configuration>
</execution>
</executions>
[17/54] [abbrv] incubator-nifi git commit: NIFI-572: Do not set UUID
as being modified when creating a clone
Posted by ma...@apache.org.
NIFI-572: Do not set UUID as being modified when creating a clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fea59e32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fea59e32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fea59e32
Branch: refs/heads/master
Commit: fea59e3249324caa37d14c3a3366321e3f2f8242
Parents: a43eecf
Author: Mark Payne <ma...@hotmail.com>
Authored: Sun May 3 16:42:54 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun May 3 16:42:54 2015 -0400
----------------------------------------------------------------------
.../repository/StandardProcessSession.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fea59e32/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index d3b0690..2c032d3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -121,8 +121,8 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
private int removedCount = 0; // number of flowfiles removed in this session
private long removedBytes = 0L; // size of all flowfiles removed in this session
- private LongHolder bytesRead = new LongHolder(0L);
- private LongHolder bytesWritten = new LongHolder(0L);
+ private final LongHolder bytesRead = new LongHolder(0L);
+ private final LongHolder bytesWritten = new LongHolder(0L);
private int flowFilesIn = 0, flowFilesOut = 0;
private long contentSizeIn = 0L, contentSizeOut = 0L;
private int writeRecursionLevel = 0;
@@ -139,11 +139,11 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
// maps a FlowFile to all Provenance Events that were generated for that FlowFile.
// we do this so that if we generate a Fork event, for example, and then remove the event in the same
// Session, we will not send that event to the Provenance Repository
- private Map<FlowFile, List<ProvenanceEventRecord>> generatedProvenanceEvents = new HashMap<>();
+ private final Map<FlowFile, List<ProvenanceEventRecord>> generatedProvenanceEvents = new HashMap<>();
// when Forks are generated for a single parent, we add the Fork event to this map, with the Key being the parent
// so that we are able to aggregate many into a single Fork Event.
- private Map<FlowFile, ProvenanceEventBuilder> forkEventBuilders = new HashMap<>();
+ private final Map<FlowFile, ProvenanceEventBuilder> forkEventBuilders = new HashMap<>();
private Checkpoint checkpoint = new Checkpoint();
@@ -266,7 +266,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
if (claim != null) {
context.getContentRepository().incrementClaimaintCount(claim);
}
- newRecord.setWorking(clone, CoreAttributes.UUID.key(), newUuid);
+ newRecord.setWorking(clone, Collections.<String, String>emptyMap());
newRecord.setDestination(destination.getFlowFileQueue());
newRecord.setTransferRelationship(record.getTransferRelationship());
@@ -1282,7 +1282,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
context.getContentRepository().incrementClaimaintCount(claim);
}
final StandardRepositoryRecord record = new StandardRepositoryRecord(null);
- record.setWorking(clone, CoreAttributes.UUID.key(), newUuid);
+ record.setWorking(clone, Collections.<String, String>emptyMap());
records.put(clone, record);
if (offset == 0L && size == example.getSize()) {
@@ -1874,7 +1874,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
try {
currentWriteClaimStream = context.getContentRepository().write(currentWriteClaim);
- } catch (IOException e) {
+ } catch (final IOException e) {
resetWriteClaims();
throw new FlowFileAccessException("Unable to obtain stream for writing to Content Repostiory: " + e, e);
}
@@ -1994,7 +1994,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
// Get the current Content Claim from the record and see if we already have
// an OutputStream that we can append to.
- ContentClaim oldClaim = record.getCurrentClaim();
+ final ContentClaim oldClaim = record.getCurrentClaim();
ByteCountingOutputStream outStream = appendableStreams.get(oldClaim);
long originalByteWrittenCount = 0;
[42/54] [abbrv] incubator-nifi git commit: NIFI-596: If IndexWriter
is opened for same directory as an IndexReader,
mark IndexReader as poisoned and stop using it
Posted by ma...@apache.org.
NIFI-596: If IndexWriter is opened for same directory as an IndexReader, mark IndexReader as poisoned and stop using it
NIFI-595: Delete .toc files when expiring an event file
NIFI-597: Only increment counter for number of documents retrieved after reading the record
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b760505b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b760505b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b760505b
Branch: refs/heads/master
Commit: b760505bf388848d5329a658bb429d4ef34afcf7
Parents: c12778f
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed May 6 15:43:20 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri May 8 12:02:39 2015 -0400
----------------------------------------------------------------------
.../expiration/FileRemovalAction.java | 28 +++++++--
.../nifi/provenance/lucene/DocsReader.java | 25 +++++---
.../nifi/provenance/lucene/IndexManager.java | 61 +++++++++++++++++---
3 files changed, 92 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b760505b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
index 1b4bafe..2333079 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/expiration/FileRemovalAction.java
@@ -20,7 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.nifi.provenance.lucene.DeleteIndexAction;
-
+import org.apache.nifi.provenance.toc.TocUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,16 +30,32 @@ public class FileRemovalAction implements ExpirationAction {
@Override
public File execute(final File expiredFile) throws IOException {
+ final boolean removed = remove(expiredFile);
+ if (removed) {
+ logger.info("Removed expired Provenance Event file {}", expiredFile);
+ } else {
+ logger.warn("Failed to remove old Provenance Event file {}; this file should be cleaned up manually", expiredFile);
+ }
+
+ final File tocFile = TocUtil.getTocFile(expiredFile);
+ if (remove(tocFile)) {
+ logger.info("Removed expired Provenance Table-of-Contents file {}", tocFile);
+ } else {
+ logger.warn("Failed to remove old Provenance Table-of-Contents file {}; this file should be cleaned up manually", expiredFile);
+ }
+
+ return removed ? null : expiredFile;
+ }
+
+ private boolean remove(final File file) {
boolean removed = false;
for (int i = 0; i < 10 && !removed; i++) {
- if ((removed = expiredFile.delete())) {
- logger.info("Removed expired Provenance Event file {}", expiredFile);
- return null;
+ if (removed = file.delete()) {
+ return true;
}
}
- logger.warn("Failed to remove old Provenance Event file {}", expiredFile);
- return expiredFile;
+ return false;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b760505b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java
index 98137fb..02fd5c3 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/DocsReader.java
@@ -64,14 +64,11 @@ public class DocsReader {
final int docId = scoreDoc.doc;
final Document d = indexReader.document(docId);
docs.add(d);
- if ( retrievalCount.incrementAndGet() >= maxResults ) {
- break;
- }
}
final long readDocuments = System.nanoTime() - start;
logger.debug("Reading {} Lucene Documents took {} millis", docs.size(), TimeUnit.NANOSECONDS.toMillis(readDocuments));
- return read(docs, allProvenanceLogFiles);
+ return read(docs, allProvenanceLogFiles, retrievalCount, maxResults);
}
@@ -88,7 +85,7 @@ public class DocsReader {
private ProvenanceEventRecord getRecord(final Document d, final RecordReader reader) throws IOException {
- IndexableField blockField = d.getField(FieldNames.BLOCK_INDEX);
+ final IndexableField blockField = d.getField(FieldNames.BLOCK_INDEX);
if ( blockField == null ) {
reader.skipTo(getByteOffset(d, reader));
} else {
@@ -97,7 +94,7 @@ public class DocsReader {
StandardProvenanceEventRecord record;
while ( (record = reader.nextRecord()) != null) {
- IndexableField idField = d.getField(SearchableFields.Identifier.getSearchableFieldName());
+ final IndexableField idField = d.getField(SearchableFields.Identifier.getSearchableFieldName());
if ( idField == null || idField.numericValue().longValue() == record.getEventId() ) {
break;
}
@@ -111,7 +108,11 @@ public class DocsReader {
}
- public Set<ProvenanceEventRecord> read(final List<Document> docs, final Collection<Path> allProvenanceLogFiles) throws IOException {
+ public Set<ProvenanceEventRecord> read(final List<Document> docs, final Collection<Path> allProvenanceLogFiles, final AtomicInteger retrievalCount, final int maxResults) throws IOException {
+ if (retrievalCount.get() >= maxResults) {
+ return Collections.emptySet();
+ }
+
LuceneUtil.sortDocsForRetrieval(docs);
RecordReader reader = null;
@@ -133,6 +134,10 @@ public class DocsReader {
try {
if (reader != null && storageFilename.equals(lastStorageFilename)) {
matchingRecords.add(getRecord(d, reader));
+
+ if ( retrievalCount.incrementAndGet() >= maxResults ) {
+ break;
+ }
} else {
logger.debug("Opening log file {}", storageFilename);
@@ -141,7 +146,7 @@ public class DocsReader {
reader.close();
}
- List<File> potentialFiles = LuceneUtil.getProvenanceLogFiles(storageFilename, allProvenanceLogFiles);
+ final List<File> potentialFiles = LuceneUtil.getProvenanceLogFiles(storageFilename, allProvenanceLogFiles);
if (potentialFiles.isEmpty()) {
logger.warn("Could not find Provenance Log File with basename {} in the "
+ "Provenance Repository; assuming file has expired and continuing without it", storageFilename);
@@ -158,6 +163,10 @@ public class DocsReader {
try {
reader = RecordReaders.newRecordReader(file, allProvenanceLogFiles);
matchingRecords.add(getRecord(d, reader));
+
+ if ( retrievalCount.incrementAndGet() >= maxResults ) {
+ break;
+ }
} catch (final IOException e) {
throw new IOException("Failed to retrieve record " + d + " from Provenance File " + file + " due to " + e, e);
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b760505b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java
index 9c3ec31..31f31a5 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/lucene/IndexManager.java
@@ -119,6 +119,14 @@ public class IndexManager implements Closeable {
}
writerCounts.put(absoluteFile, writerCount);
+
+ // Mark any active searchers as poisoned because we are updating the index
+ final List<ActiveIndexSearcher> searchers = activeSearchers.get(absoluteFile);
+ if ( searchers != null ) {
+ for (final ActiveIndexSearcher activeSearcher : searchers) {
+ activeSearcher.poison();
+ }
+ }
} else {
logger.debug("Providing existing index writer for {} and incrementing count to {}", indexingDirectory, writerCount.getCount() + 1);
writerCounts.put(absoluteFile, new IndexWriterCount(writerCount.getWriter(),
@@ -137,7 +145,7 @@ public class IndexManager implements Closeable {
lock.lock();
try {
- IndexWriterCount count = writerCounts.remove(absoluteFile);
+ final IndexWriterCount count = writerCounts.remove(absoluteFile);
try {
if ( count == null ) {
@@ -184,6 +192,15 @@ public class IndexManager implements Closeable {
try {
for ( final ActiveIndexSearcher searcher : currentlyCached ) {
if ( searcher.isCache() ) {
+ // if the searcher is poisoned, we want to close and expire it.
+ if ( searcher.isPoisoned() ) {
+ logger.debug("Index Searcher for {} is poisoned; removing cached searcher", absoluteFile);
+ expired.add(searcher);
+ continue;
+ }
+
+ // if there are no references to the reader, it will have been closed. Since there is no
+ // isClosed() method, this is how we determine whether it's been closed or not.
final int refCount = searcher.getSearcher().getIndexReader().getRefCount();
if ( refCount <= 0 ) {
// if refCount == 0, then the reader has been closed, so we need to discard the searcher
@@ -212,7 +229,7 @@ public class IndexManager implements Closeable {
}
}
- IndexWriterCount writerCount = writerCounts.remove(absoluteFile);
+ final IndexWriterCount writerCount = writerCounts.remove(absoluteFile);
if ( writerCount == null ) {
final Directory directory = FSDirectory.open(absoluteFile);
logger.debug("No Index Writer currently exists for {}; creating a cachable reader", indexDir);
@@ -270,21 +287,40 @@ public class IndexManager implements Closeable {
lock.lock();
try {
// check if we already have a reader cached.
- List<ActiveIndexSearcher> currentlyCached = activeSearchers.get(absoluteFile);
+ final List<ActiveIndexSearcher> currentlyCached = activeSearchers.get(absoluteFile);
if ( currentlyCached == null ) {
logger.warn("Received Index Searcher for {} but no searcher was provided for that directory; this could "
+ "result in a resource leak", indexDirectory);
return;
}
+ // Check if the given searcher is in our list. We use an Iterator to do this so that if we
+ // find it we can call remove() on the iterator if need be.
final Iterator<ActiveIndexSearcher> itr = currentlyCached.iterator();
while (itr.hasNext()) {
final ActiveIndexSearcher activeSearcher = itr.next();
if ( activeSearcher.getSearcher().equals(searcher) ) {
if ( activeSearcher.isCache() ) {
- // the searcher is cached. Just leave it open.
- logger.debug("Index searcher for {} is cached; leaving open", indexDirectory);
- return;
+ // if the searcher is poisoned, close it and remove from "pool".
+ if ( activeSearcher.isPoisoned() ) {
+ itr.remove();
+
+ try {
+ logger.debug("Closing Index Searcher for {} because it is poisoned", indexDirectory);
+ activeSearcher.close();
+ } catch (final IOException ioe) {
+ logger.warn("Failed to close Index Searcher for {} due to {}", absoluteFile, ioe);
+ if ( logger.isDebugEnabled() ) {
+ logger.warn("", ioe);
+ }
+ }
+
+ return;
+ } else {
+ // the searcher is cached. Just leave it open.
+ logger.debug("Index searcher for {} is cached; leaving open", indexDirectory);
+ return;
+ }
} else {
// searcher is not cached. It was created from a writer, and we want
// the newest updates the next time that we get a searcher, so we will
@@ -405,9 +441,10 @@ public class IndexManager implements Closeable {
private final DirectoryReader directoryReader;
private final Directory directory;
private final boolean cache;
+ private boolean poisoned = false;
- public ActiveIndexSearcher(IndexSearcher searcher, DirectoryReader directoryReader,
- Directory directory, final boolean cache) {
+ public ActiveIndexSearcher(final IndexSearcher searcher, final DirectoryReader directoryReader,
+ final Directory directory, final boolean cache) {
this.searcher = searcher;
this.directoryReader = directoryReader;
this.directory = directory;
@@ -422,6 +459,14 @@ public class IndexManager implements Closeable {
return searcher;
}
+ public boolean isPoisoned() {
+ return poisoned;
+ }
+
+ public void poison() {
+ this.poisoned = true;
+ }
+
@Override
public void close() throws IOException {
IndexManager.close(directoryReader, directory);
[29/54] [abbrv] incubator-nifi git commit: NIFI-592: - Syncing site
content with current. - Pulling in generated docs into site content.
Posted by ma...@apache.org.
NIFI-592:
- Syncing site content with current.
- Pulling in generated docs into site content.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f3e76fef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f3e76fef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f3e76fef
Branch: refs/heads/master
Commit: f3e76fef1b9830080d0dc10d8c6e8851eeb26e90
Parents: 37e5548
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue May 5 16:11:29 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue May 5 16:11:29 2015 -0400
----------------------------------------------------------------------
nifi-site/Gruntfile.js | 115 +++++++++++------
nifi-site/package.json | 45 +++----
nifi-site/src/images/flow.png | Bin 503302 -> 920561 bytes
nifi-site/src/includes/header.hbs | 2 +-
nifi-site/src/includes/topbar.hbs | 5 +-
.../src/pages/html/administrator-guide.hbs | 7 ++
nifi-site/src/pages/html/developer-guide.hbs | 2 +-
nifi-site/src/pages/html/download.hbs | 18 +++
nifi-site/src/pages/html/mailing_lists.hbs | 7 ++
nifi-site/src/pages/html/overview.hbs | 2 +-
nifi-site/src/pages/html/people.hbs | 27 +---
nifi-site/src/pages/html/rest-api.hbs | 7 ++
nifi-site/src/pages/html/roadmap.hbs | 30 -----
nifi-site/src/pages/html/screencasts.hbs | 45 ++++++-
nifi-site/src/pages/html/user-guide.hbs | 2 +-
nifi-site/src/pages/markdown/licensing-guide.md | 120 ++++++++++++++++++
nifi-site/src/pages/markdown/quickstart.md | 17 +--
nifi-site/src/pages/markdown/release-guide.md | 126 ++++++++++++++-----
18 files changed, 410 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/Gruntfile.js
----------------------------------------------------------------------
diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js
index c9e9bb8..731b172 100644
--- a/nifi-site/Gruntfile.js
+++ b/nifi-site/Gruntfile.js
@@ -2,16 +2,15 @@ module.exports = function (grunt) {
// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
-
clean: {
options: {
force: true
},
js: ['dist/js/'],
css: ['dist/css/'],
- assets: ['dist/assets/*']
+ assets: ['dist/assets/*'],
+ generated: ['dist/docs']
},
-
assemble: {
options: {
partials: 'src/includes/*.hbs',
@@ -32,7 +31,6 @@ module.exports = function (grunt) {
}
}
},
-
compass: {
dist: {
options: {
@@ -40,7 +38,6 @@ module.exports = function (grunt) {
}
}
},
-
concat: {
options: {
separator: ';'
@@ -66,48 +63,82 @@ module.exports = function (grunt) {
dest: 'dist/js/app.js'
}
},
-
copy: {
+ generated: {
+ files: [{
+ expand: true,
+ cwd: '../nifi/nifi-docs/target/generated-docs',
+ src: ['*.html', 'images/*'],
+ dest: 'dist/docs/'
+ }, {
+ expand: true,
+ cwd: '../nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api',
+ src: ['target/nifi-web-api-*/docs/rest-api/index.html', 'target/nifi-web-api-*/docs/rest-api/images/*'],
+ dest: 'dist/docs/',
+ rename: function (dest, src) {
+ var path = require('path');
+
+ if (src.indexOf('images') > 0) {
+ return path.join(dest, 'rest-api/images', path.basename(src));
+ } else {
+ return path.join(dest, 'rest-api', path.basename(src));
+ }
+ }
+ }]
+ },
dist: {
files: [{
- expand: true,
- cwd: 'src/images/',
- src: ['**/*.{png,jpg,gif,svg,ico}'],
- dest: 'dist/images/'
- }, {
- expand: true,
- cwd: 'bower_components/jquery/dist',
- src: ['jquery.min.js'],
- dest: 'dist/assets/js/'
- }, {
- expand: true,
- cwd: 'bower_components/webfontloader',
- src: ['webfontloader.js'],
- dest: 'dist/assets/js/'
- }, {
- expand: true,
- cwd: 'bower_components/font-awesome/css',
- src: ['font-awesome.min.css'],
- dest: 'dist/assets/stylesheets/'
- }, {
- expand: true,
- cwd: 'bower_components/font-awesome',
- src: ['fonts/*'],
- dest: 'dist/assets/'
- }]
+ expand: true,
+ cwd: 'src/images/',
+ src: ['**/*.{png,jpg,gif,svg,ico}'],
+ dest: 'dist/images/'
+ }, {
+ expand: true,
+ cwd: 'bower_components/jquery/dist',
+ src: ['jquery.min.js'],
+ dest: 'dist/assets/js/'
+ }, {
+ expand: true,
+ cwd: 'bower_components/webfontloader',
+ src: ['webfontloader.js'],
+ dest: 'dist/assets/js/'
+ }, {
+ expand: true,
+ cwd: 'bower_components/font-awesome/css',
+ src: ['font-awesome.min.css'],
+ dest: 'dist/assets/stylesheets/'
+ }, {
+ expand: true,
+ cwd: 'bower_components/font-awesome',
+ src: ['fonts/*'],
+ dest: 'dist/assets/'
+ }]
+ }
+ },
+ exec: {
+ generateDocs: {
+ command: 'mvn clean package',
+ cwd: '../nifi/nifi-docs',
+ stdout: true,
+ stderr: true
+ },
+ generateRestApiDocs: {
+ command: 'mvn clean package -DskipTests',
+ cwd: '../nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api',
+ stdout: true,
+ stderr: true
}
},
-
watch: {
- grunt: {
- files: ['Gruntfile.js'],
- tasks: ['dev']
+ grunt: {
+ files: ['Gruntfile.js'],
+ tasks: ['dev']
},
css: {
files: 'src/scss/*.scss',
tasks: ['css']
},
- script: {
+ script: {
files: 'src/js/*.js',
tasks: ['js']
},
@@ -121,7 +152,7 @@ module.exports = function (grunt) {
}
}
});
-
+
grunt.loadNpmTasks('grunt-newer');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-copy');
@@ -129,10 +160,12 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('assemble');
grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-watch');
-
+ grunt.loadNpmTasks('grunt-exec');
+
grunt.registerTask('img', ['newer:copy']);
grunt.registerTask('css', ['clean:css', 'compass']);
- grunt.registerTask('js', ['clean:js', 'concat']);
- grunt.registerTask('default', ['clean', 'assemble', 'css', 'js', 'img', 'copy']);
- grunt.registerTask('dev', ['default', 'watch']);
+ grunt.registerTask('js', ['clean:js', 'concat']);
+ grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated']);
+ grunt.registerTask('default', ['clean', 'assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']);
+ grunt.registerTask('dev', ['default', 'watch']);
};
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/package.json
----------------------------------------------------------------------
diff --git a/nifi-site/package.json b/nifi-site/package.json
index 170d4ad..92304ef 100644
--- a/nifi-site/package.json
+++ b/nifi-site/package.json
@@ -1,24 +1,25 @@
{
- "name": "apache-nifi-site",
- "version": "0.0.2-incubating",
- "description": "The artifacts for the Apache NiFi site.",
- "private": "true",
- "repository": {
- "type": "git",
- "url": "http://git-wip-us.apache.org/repos/asf/incubator-nifi.git"
- },
- "devDependencies": {
- "assemble": "^0.4.42",
- "grunt": "^0.4.5",
- "grunt-contrib-clean": "^0.6.0",
- "grunt-contrib-compass": "^1.0.1",
- "grunt-contrib-concat": "^0.5.0",
- "grunt-contrib-copy": "^0.7.0",
- "grunt-contrib-watch": "^0.6.1",
- "grunt-newer": "^1.1.0"
- },
- "licenses" : [{
- "type": "Apache",
- "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
- }]
+ "name": "apache-nifi-site",
+ "version": "0.0.2-incubating",
+ "description": "The artifacts for the Apache NiFi site.",
+ "private": "true",
+ "repository": {
+ "type": "git",
+ "url": "http://git-wip-us.apache.org/repos/asf/incubator-nifi.git"
+ },
+ "devDependencies": {
+ "assemble": "^0.4.42",
+ "grunt": "^0.4.5",
+ "grunt-contrib-clean": "^0.6.0",
+ "grunt-contrib-compass": "^1.0.1",
+ "grunt-contrib-concat": "^0.5.0",
+ "grunt-contrib-copy": "^0.7.0",
+ "grunt-contrib-watch": "^0.6.1",
+ "grunt-exec": "^0.4.6",
+ "grunt-newer": "^1.1.0"
+ },
+ "licenses": [{
+ "type": "Apache",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+ }]
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/images/flow.png
----------------------------------------------------------------------
diff --git a/nifi-site/src/images/flow.png b/nifi-site/src/images/flow.png
index 2b48140..c9e571a 100644
Binary files a/nifi-site/src/images/flow.png and b/nifi-site/src/images/flow.png differ
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/includes/header.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/includes/header.hbs b/nifi-site/src/includes/header.hbs
index 5940e6b..49f320d 100644
--- a/nifi-site/src/includes/header.hbs
+++ b/nifi-site/src/includes/header.hbs
@@ -16,7 +16,7 @@
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-57264262-1', 'auto');
ga('send', 'pageview');
- </script>
+ </script>
</head>
<body>
{{> topbar}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/includes/topbar.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/includes/topbar.hbs b/nifi-site/src/includes/topbar.hbs
index 6069a34..959771c 100644
--- a/nifi-site/src/includes/topbar.hbs
+++ b/nifi-site/src/includes/topbar.hbs
@@ -20,7 +20,6 @@
<ul class="dropdown">
<li><a href="index.html">Home</a></li>
<li><a href="https://blogs.apache.org/nifi/"><i class="fa fa-external-link external-link"></i>Apache NiFi Blog</a></li>
- <li><a href="roadmap.html">Roadmap</a></li>
<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link external-link"></i>License</a></li>
</ul>
</li>
@@ -32,6 +31,8 @@
<li><a href="overview.html">NiFi Overview</a></li>
<li><a href="user-guide.html">User Guide</a></li>
<li><a href="developer-guide.html">Developer Guide</a></li>
+ <li><a href="administrator-guide.html">Admin Guide</a></li>
+ <li><a href="rest-api.html">Rest Api</a></li>
</ul>
</li>
<li class="has-dropdown">
@@ -52,6 +53,8 @@
<ul class="dropdown">
<li><a href="quickstart.html">Quickstart</a></li>
<li><a href="release-guide.html">Release Guide</a></li>
+ <li><a href="licensing-guide.html">Licensing Guide</a></li>
+ <li><a href="developer-guide.html">Developer Guide</a></li>
<li><a href="https://git-wip-us.apache.org/repos/asf/incubator-nifi.git"><i class="fa fa-external-link external-link"></i>Source</a></li>
<li><a href="https://issues.apache.org/jira/browse/NIFI"><i class="fa fa-external-link external-link"></i>Issues</a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/administrator-guide.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/administrator-guide.hbs b/nifi-site/src/pages/html/administrator-guide.hbs
new file mode 100644
index 0000000..a58e8d2
--- /dev/null
+++ b/nifi-site/src/pages/html/administrator-guide.hbs
@@ -0,0 +1,7 @@
+---
+title: Apache NiFi Administrator Guide
+---
+
+<div class="external-guide">
+ <iframe src="docs/administration-guide.html"></iframe>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/developer-guide.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/developer-guide.hbs b/nifi-site/src/pages/html/developer-guide.hbs
index 7d8a250..690923e 100644
--- a/nifi-site/src/pages/html/developer-guide.hbs
+++ b/nifi-site/src/pages/html/developer-guide.hbs
@@ -3,5 +3,5 @@ title: Apache NiFi Developer Guide
---
<div class="external-guide">
- <iframe src="https://nifi.incubator.apache.org/docs/nifi-docs/developer-guide.html"></iframe>
+ <iframe src="docs/developer-guide.html"></iframe>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/download.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/download.hbs b/nifi-site/src/pages/html/download.hbs
index 6e03b28..9e4ba7c 100644
--- a/nifi-site/src/pages/html/download.hbs
+++ b/nifi-site/src/pages/html/download.hbs
@@ -23,6 +23,24 @@ title: Apache NiFi Downloads
<div class="large-12 columns">
<h2>Releases</h2>
<ul>
+ <li>0.0.2-incubating
+ <ul>
+ <li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329373">Release Notes</a></li>
+ <li>
+ Sources:
+ <ul>
+ <li><a href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip">nifi-0.0.2-incubating-source-release.zip</a> ( <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip.asc">asc</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-source-release.zip.sha1">sha1</a> )</li>
+ </ul>
+ </li>
+ <li>
+ Binaries
+ <ul>
+ <li><a href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz">nifi-0.0.2-incubating-bin.tar.gz</a> ( <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz.asc">asc</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.tar.gz.sha1">sha1</a> )</li>
+ <li><a href="https://www.apache.org/dyn/closer.cgi?path=/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip">nifi-0.0.2-incubating-bin.zip</a> ( <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip.asc">asc</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip.md5">md5</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.2-incubating/nifi-0.0.2-incubating-bin.zip.sha1">sha1</a> )</li>
+ </ul>
+ </li>
+ </ul>
+ </li>
<li>0.0.1-incubating
<ul>
<li><a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329078">Release Notes</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/mailing_lists.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/mailing_lists.hbs b/nifi-site/src/pages/html/mailing_lists.hbs
index 076b684..049e470 100644
--- a/nifi-site/src/pages/html/mailing_lists.hbs
+++ b/nifi-site/src/pages/html/mailing_lists.hbs
@@ -30,6 +30,13 @@ title: Apache NiFi Mailing Lists
<th>Archive</th>
</tr>
<tr>
+ <td>Users Mailing List</td>
+ <td><a class="externalLink" href="mailto:users-subscribe@nifi.incubator.apache.org">Subscribe</a></td>
+ <td><a class="externalLink" href="mailto:users-unsubscribe@nifi.incubator.apache.org">Unsubscribe</a></td>
+ <td><a class="externalLink" href="mailto:users@nifi.incubator.apache.org">Post</a></td>
+ <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/incubator-nifi-users/">mail-archives.apache.org</a></td>
+ </tr>
+ <tr>
<td>Developers Mailing List</td>
<td><a class="externalLink" href="mailto:dev-subscribe@nifi.incubator.apache.org">Subscribe</a></td>
<td><a class="externalLink" href="mailto:dev-unsubscribe@nifi.incubator.apache.org">Unsubscribe</a></td>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/overview.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/overview.hbs b/nifi-site/src/pages/html/overview.hbs
index eaaee22..b2eae1c 100644
--- a/nifi-site/src/pages/html/overview.hbs
+++ b/nifi-site/src/pages/html/overview.hbs
@@ -3,5 +3,5 @@ title: Apache NiFi Overview
---
<div class="external-guide">
- <iframe src="https://nifi.incubator.apache.org/docs/nifi-docs/overview.html"></iframe>
+ <iframe src="docs/overview.html"></iframe>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/people.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/people.hbs b/nifi-site/src/pages/html/people.hbs
index 77b8d9c..66ab0d0 100644
--- a/nifi-site/src/pages/html/people.hbs
+++ b/nifi-site/src/pages/html/people.hbs
@@ -37,6 +37,11 @@ title: Apache NiFi Team
<th>Affiliation</th>
</tr>
<tr>
+ <td>aldrin</td>
+ <td>Aldrin Piri</td>
+ <td></td>
+ </tr>
+ <tr>
<td>apurtell</td>
<td>Andrew Purtell</td>
<td>Mentor</td>
@@ -113,24 +118,4 @@ title: Apache NiFi Team
</tr>
</table>
</div>
-</div>
-<div class="medium-space"></div>
-<div class="row">
- <div class="large-12 columns">
- <h2 class="nifi-txt">
- <span>
- Committers
- </span>
- </h2>
- </div>
-</div>
-<div class="row">
- <div class="large-12 columns">
- <table>
- <tr>
- <th>Id</th>
- <th>Name</th>
- </tr>
- </table>
- </div>
-</div>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/rest-api.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/rest-api.hbs b/nifi-site/src/pages/html/rest-api.hbs
new file mode 100644
index 0000000..34e8fa6
--- /dev/null
+++ b/nifi-site/src/pages/html/rest-api.hbs
@@ -0,0 +1,7 @@
+---
+title: Apache NiFi Developer Guide
+---
+
+<div class="external-guide">
+ <iframe src="docs/rest-api/index.html"></iframe>
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/roadmap.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/roadmap.hbs b/nifi-site/src/pages/html/roadmap.hbs
deleted file mode 100644
index 45da108..0000000
--- a/nifi-site/src/pages/html/roadmap.hbs
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: Apache NiFi Roadmap
----
-
-<div class="large-space"></div>
-<div class="row">
- <div class="large-12 columns">
- <h1 class="nifi-txt">
- <span>
- Apache <span class="ni">ni</span><span class="fi">fi</span> Roadmap
- </span>
- </h1>
- </div>
-</div>
-<div class="row">
- <div class="large-12 columns">
- <h3 class="nifi-txt">
- <span>
- First steps
- </span>
- </h3>
- </div>
-</div>
-<div class="row">
- <div class="large-12 columns">
- <p class="description">
- Initial work on Apache NiFi (incubating) will be focused on an initial incubating release. This means, migrating to apache infrastructure, using apache license compatible dependencies, developing developer documentation, and working out bugs introduced or discovered during this process.
- </p>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/screencasts.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/screencasts.hbs b/nifi-site/src/pages/html/screencasts.hbs
index 78c0466..fcd78f9 100644
--- a/nifi-site/src/pages/html/screencasts.hbs
+++ b/nifi-site/src/pages/html/screencasts.hbs
@@ -15,7 +15,25 @@ title: Apache NiFi Screencasts
<div id="toolbar-overview" class="reveal-modal medium" data-reveal>
<h2>NiFi Toolbar Overview</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/LGXRAVUzL4U" frameborder="0" allowfullscreen></iframe>
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/LGXRAVUzL4U?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="build-a-flow-1">Build a Simple Flow - Part 1</a>
+ <div id="build-a-flow-1" class="reveal-modal medium" data-reveal>
+ <h2>Build a Simple Flow - Part 1</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/jctMMHTdTQI?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="build-a-flow-2">Build a Simple Flow - Part 2</a>
+ <div id="build-a-flow-2" class="reveal-modal medium" data-reveal>
+ <h2>Build a Simple Flow - Part 2</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/X6bPFgaBDIo?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
@@ -24,7 +42,7 @@ title: Apache NiFi Screencasts
<div id="creating-process-groups" class="reveal-modal medium" data-reveal>
<h2>Creating Process Groups</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/hAveiDgDj-8" frameborder="0" allowfullscreen></iframe>
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/hAveiDgDj-8?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
@@ -33,7 +51,25 @@ title: Apache NiFi Screencasts
<div id="creating-templates" class="reveal-modal medium" data-reveal>
<h2>Creating Templates</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/PpmL-IMoCnU" frameborder="0" allowfullscreen></iframe>
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/PpmL-IMoCnU?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="summary-overview">Summary Overview</a>
+ <div id="summary-overview" class="reveal-modal medium" data-reveal>
+ <h2>Summary Overview</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/XfY9AEOYLHI?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
+ </div>
+ <a class="close-reveal-modal">×</a>
+ </div>
+ <br/>
+ <a href="#" data-reveal-id="provenance-overview">Provenance Overview</a>
+ <div id="provenance-overview" class="reveal-modal medium" data-reveal>
+ <h2>Summary Page Overview</h2>
+ <div class="flex-video widescreen" style="display: block;">
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/WUKXed_bLws?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
@@ -42,9 +78,10 @@ title: Apache NiFi Screencasts
<div id="managing-templates" class="reveal-modal medium" data-reveal>
<h2>Managing Templates</h2>
<div class="flex-video widescreen" style="display: block;">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/HU5_3PlNmtQ" frameborder="0" allowfullscreen></iframe>
+ <iframe width="560" height="315" src="https://www.youtube.com/embed/HU5_3PlNmtQ?list=PLHre9pIBAgc4e-tiq9OIXkWJX8bVXuqlG" frameborder="0" allowfullscreen></iframe>
</div>
<a class="close-reveal-modal">×</a>
</div>
+ <br/>
</div>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/html/user-guide.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/user-guide.hbs b/nifi-site/src/pages/html/user-guide.hbs
index 19537d8..8fa6c7d 100644
--- a/nifi-site/src/pages/html/user-guide.hbs
+++ b/nifi-site/src/pages/html/user-guide.hbs
@@ -3,5 +3,5 @@ title: Apache NiFi User Guide
---
<div class="external-guide">
- <iframe src="https://nifi.incubator.apache.org/docs/nifi-docs/user-guide.html"></iframe>
+ <iframe src="docs/user-guide.html"></iframe>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/markdown/licensing-guide.md
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/markdown/licensing-guide.md b/nifi-site/src/pages/markdown/licensing-guide.md
new file mode 100644
index 0000000..ac7fb3b
--- /dev/null
+++ b/nifi-site/src/pages/markdown/licensing-guide.md
@@ -0,0 +1,120 @@
+---
+title: Apache NiFi Licensing Guide
+---
+
+# Apache NiFi Release Guidelines
+
+This document provides guidance to contributors of Apache NiFi (incubating) to help properly account for licensing, notice, and legal requirements.
+
+#### Disclaimer:
+
+This document is not written by lawyers. The guidance in this document is meant to compliment Apache Incubator and Apache Software Foundation guides and policies. If anything in this document is inconsistent with those then it is a defect in this document.
+
+## Background Material
+
+- [ASLv2](http://apache.org/licenses/LICENSE-2.0)
+- [ASF License Apply](http://www.apache.org/dev/apply-license.html)
+- [ASF Licensing How-To](http://www.apache.org/dev/licensing-howto.html)
+- [ASF Legal Resolved](http://www.apache.org/legal/resolved.html)
+- [ASF Release Policy](http://www.apache.org/dev/release.html)
+- [ASF Incubator License and Notice Guidance](http://incubator.apache.org/guides/releasemanagement.html#note-license-and-notice)
+
+## How to consistently apply licensing/legal notice information for Apache NiFi
+
+### Apply the source header to each source file
+
+Every source file for works submitted directly to the ASF must follow: http://apache.org/legal/src-headers.html#headers
+
+Question: Every source file? What about test files and so on?
+Answer: There are a few exceptions. Test files can be argued to have no degree of creativity. We also need our test materials at times to be exactly as they will be found in the wild. We should ensure test files have the license when possible but not to the point that it requires altering the test itself.
+ http://apache.org/legal/src-headers.html#faq-exceptions
+
+Question: Do items which are generated from source during the build process require the header?
+Answer: Taken directly from http://incubator.apache.org/guides/releasemanagement.html#notes-license-headers it reads:
+ "Copyright may not subsist in a document which is generated by an transformation from an original. In which case, the license header may be unnecessary. License headers should always be present in the original. Where it is reasonable to do so, the templates should also add the license header to the generated documents."
+
+### Apply the proper NOTICE / LICENSE Information
+
+For every addition or removal of a 3rd party work as a dependency or as pulled into our source directly we must ensure full
+accounting of the correct LICENSE and NOTICE information.
+
+Our source release must only account for the LICENSE/NOTICE of items that are actually in the source release itself.
+Binary dependencies which are pulled in during the generation of a binary convenience package should not have their
+LICENSE/NOTICE data in the source release. But, they must be accounted for in the binary package.
+
+The LICENSE and NOTICE files found at the root of the Apache NiFi (nifi) component is considered 'The' LICENSE/NOTICE
+covering the source release of 'nifi' and all subcomponents.
+
+The LICENSE and NOTICE files found within the 'nifi-assembly' is considered 'The' LICENSE/NOTICE pair covering the binary
+convenience package of 'nifi' (tar.gz, ZIP, etc..)
+
+The Release Manager (RM) of a given release is responsible for checking all subcomponents for the presence of specific
+LICENSE/NOTICE to gather all source dependency clauses as needed and place them into the overall LICENSE/NOTICE for the
+source release. If generating a binary convenience package the RM will gather up a listing of all binary dependencies
+as called out on subcomponents (including the assembly itself), which can contain binary dependencies, and promote
+their specific NOTICE/LICENSE text to the binary package LICENSE/NOTICE associated with the assembly. The binary package
+LICENSE/NOTICE then should be a combination of source license data and binary license data.
+
+A binary artifact is any artifact which is created as the result of "compiling" or processing a source artifact.
+
+For every subcomponent of nifi some binary artifact is produced because we make these things available as Maven artifacts. You must consider whether that artifact stands on its own as built from source or whether that artifact is comprised of materials built from source combined with other binary artifacts pulled in as dependencies.
+
+In the case of subcomponents which produce binary artifacts which stand on their own (as would be typical in most Jar
+files) then you must only account for any 3rd party works source dependencies. If you have any 3rd party works source
+dependencies then you should create or edit the LICENSE and/or NOTICE local to that subcomponent AND modify the
+NOTICE and/or LICENSE of the top level nifi source.
+
+In the case of subcomponents which produce binary artifacts which themselves can bunde 3rd party works (as would be
+typical in a NAR, WAR, tar.gz, zip bundle) then you must ensure that the subcomponent binary artifact itself includes
+a full and complete LICENSE and/or NOTICE as needed to cover those 3rd party works. For every modification to the
+subcomponent LICENSE/NOTICE for a given 3rd party work the overall Apache NiFi source and binary LICENSE/NOTICE pairs
+need to be updated and/or verified as well.
+
+To provide a subcomponent local LICENSE/NOTICE ensure there is a 'src/main/resources/META-INF/NOTICE' and
+'src/main/resources/META-INF/LICENSE' as needed. During the build process Maven will place them in the customary
+locations for the binary artifact. This way for every binary artifact produced from Apache NiFi there will be a
+local and accurate LICENSE/NOTICE for that artifact.
+
+### How to go about working with the LICENSE/NOTICE modifications
+
+If the dependency is a source dependency (ie you copied in javascript, css, java source files from a website) then you
+ must ensure it is from [Category-A](http://www.apache.org/legal/resolved.html#category-a) licenses.
+
+If the dependency is a binary dependency (ie maven pulled in a jar file) then you must ensure it is either from
+[Category-A](http://www.apache.org/legal/resolved.html#category-a) or
+[Category-B](http://www.apache.org/legal/resolved.html#category-b).
+
+The key guides for how to apply the LICENSE/NOTICE is found in the following:
+
+ - [Source Headers](http://apache.org/legal/src-headers.html#3party)
+ - [Third Party Notices](http://apache.org/legal/resolved.html#required-third-party-notices.)
+ - [How to modify the NOTICE](http://www.apache.org/dev/licensing-howto.html#mod-notice)
+
+Specific guidance for handling LICENSE/NOTICE application for typical MIT/BSD licenses is
+described [here](http://www.apache.org/dev/licensing-howto.html#permissive-deps). For understanding what to put in the
+LICENSE file look at the license of the 3rd party work. BSD licenses for instance have this statement "Redistributions
+in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution." In the event you cannot find the actual
+Copyright statement for a dependency then place a link to the license text they claim and indicate no copyright marks
+found and provide a link to the project website.
+
+Specific guidance for handling Apache Licensed dependencies is describe [here](http://www.apache.org/dev/licensing-howto.html#alv2-dep).
+"If the dependency supplies a NOTICE file, its contents must be analyzed and the relevant portions bubbled up into the top-level NOTICE file."
+
+Specific guidance for handling other ASF projects is found [here](http://www.apache.org/dev/licensing-howto.html#bundle-asf-product).
+"It is not necessary to duplicate the line "This product includes software developed at the Apache Software
+Foundation...", though the ASF copyright line and any other portions of NOTICE must be considered for propagation."
+
+Specific guidance for handling LICENSE/NOTICE information for category-B licensed works is [here](http://apache.org/legal/resolved.html#category-b).
+Place an entry in the notice indicating the work is included in binary distribution. Provide a link to the
+homepage of the work. Indicate it's license. Group like licensed items together. "By attaching a prominent label to
+the distribution and requiring an explicit action by the user to get the reciprocally-licensed source, users are less
+likely to be unaware of restrictions significantly different from those of the Apache License. Please include the URL
+to the product's homepage in the prominent label." You should not modify the LICENSE file to include the LICENSE
+information of the 3rd party work in this case. That is explained nicely in http://opensource.org/faq#copyleft as
+stated "Copyleft provisions apply only to actual derivatives, that is, cases where an existing copylefted work was
+modified. Merely distributing a copyleft work alongside a non-copyleft work does not cause the latter to fall under
+the copyleft terms."
+
+Specific guidance for handling works in the public domain is [here](http://apache.org/legal/resolved.html#can-works-placed-in-the-public-domain-be-included-in-apache-products)
+
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/markdown/quickstart.md b/nifi-site/src/pages/markdown/quickstart.md
index c0148d7..379cda9 100644
--- a/nifi-site/src/pages/markdown/quickstart.md
+++ b/nifi-site/src/pages/markdown/quickstart.md
@@ -4,20 +4,11 @@ title: Apache NiFi Development Quickstart
# Apache NiFi Development Quickstart
-This documentation is in progress, but should get many started at building Apache NiFi.
-
## Source Code
Apache NiFi source code is version controlled using [Git][git] version control ([browse][gitbrowse]|[checkout][gitrepo]).
-
The code is also mirrored to [Github][githubrepo]
-The code as it was initially contributed and entered the incubator is on the 'master' branch.
-
-To view the lastest codebase as we work toward an initial release checkout the 'develop' branch.
-
-All guidance that follows assumes you are working on the 'develop' branch.
-
## Issue Tracking
Track issues on the "NIFI" Project on the Apache Jira ([browse][jira]).
@@ -42,9 +33,13 @@ git checkout develop
1. You need a recent Java 7 (or newer) JDK.
2. You need Apache [Maven 3.X][maven]. We've successfully used 3.2.3 and as far back as 3.0.5
-3. Build the maven plugins. In the root dir of the source tree cd to `nifi-nar-maven-plugin`.
+3. Ensure your MAVEN_OPTS provides sufficient memory. Some build steps are fairly memory intensive
+ - These settings have worked well `MAVEN_OPTS="-Xms1024m -Xmx3076m -XX:MaxPermSize=256m"`
+4. Build the nifi parent. In the root dir of the source tree cd to `nifi-parent`.
+ Run `mvn clean install`
+5. Build the nifi nar maven plugin. In the root dir of the source tree cd to `nifi-nar-maven-plugin`.
Run `mvn clean install`
-4. Build the entire code base. In the root dir of the source tree cd to `nifi` and run `mvn -T C2.0 clean install`
+6. Build the entire code base. In the root dir of the source tree cd to `nifi` and run `mvn -T C2.0 clean install`
You can tweak the maven build settings as you like but the previous command will execute with 2 threads per core.
Now you should have a fully functioning build off the latest code in the develop branch.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f3e76fef/nifi-site/src/pages/markdown/release-guide.md
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/markdown/release-guide.md b/nifi-site/src/pages/markdown/release-guide.md
index 7387692..b1df726 100644
--- a/nifi-site/src/pages/markdown/release-guide.md
+++ b/nifi-site/src/pages/markdown/release-guide.md
@@ -50,20 +50,18 @@ There are two lists here: one of specific incubator requirements, and another of
- Specifically look in the *-sources.zip artifact and ensure these items are present at the root of the archive.
- Evaluate the sources and dependencies. Does the overall LICENSE and NOTICE appear correct? Do all licenses fit within the ASF approved licenses?
- Here is an example path to a sources artifact:
- - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip`
+ - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip`
- Is there a README available that explains how to build the application and to execute it?
- Look in the *-sources.zip artifact root for the readme.
- Are the signatures and hashes correct for the source release?
- Validate the hashes of the sources artifact do in fact match:
- - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.md5`
- - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.sha1`
- - Validate the signatures of the sources artifact and of each of the hashes. Here are example paths:
- - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.asc`
- - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.asc.md5`
- - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi-nar-maven-plugin/0.0.1-incubating/nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip.asc.sha1`
+ - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.md5`
+ - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.sha1`
+ - Validate the signature of the source artifact. Here is an example path:
+ - `https://repository.apache.org/service/local/repositories/orgapachenifi-1011/content/org/apache/nifi/nifi/0.0.1-incubating/nifi-0.0.1-incubating-source-release.zip.asc`
- Need a quick reminder on how to [verify a signature](http://www.apache.org/dev/release-signing.html#verifying-signature)?
- Do all sources have necessary headers?
- - Unzip the sources file into a directory and execute `mvn install -Pcheck-licenses`
+ - Unzip the sources file into a directory and execute `mvn install -Pcontrib-check`
- Are there no unexpected binary files in the release?
- The only thing we'd expect would be potentially test resources files.
- Does the app (if appropriate) execute and function as expected?
@@ -95,9 +93,9 @@ have in mind the release version you are planning for. For example we'll consid
Create the next version in JIRA if necessary so develop work can continue towards that release.
Create new branch off develop named after the JIRA ticket or just use the develop branch itself. Here we'll use a branch off of develop with
-`git checkout -b NIFI-270`
+`git checkout -b NIFI-270-RC1`
-Change directory into that of the project you wish to release. For example either `cd nifi` or `cd nifi-nar-maven-plugin`
+Change directory into that of the project you wish to release. For example `cd nifi`
Verify that Maven has sufficient heap space to perform the build tasks. Some plugins and parts of the build
consumes a surprisingly large amount of space. These settings have been shown to
@@ -128,34 +126,34 @@ Ensure your settings.xml has been updated as shown below. There are other ways
Ensure the the full application build and tests all work by executing
`mvn -T 2.5C clean install` for a parallel build. Once that completes you can
-startup and test the application by `cd assembly/target` then run `bin/nifi.sh start` in the nifi build.
+startup and test the application by `cd nifi-assembly/target` then run `bin/nifi.sh start` in the nifi build.
The application should be up and running in a few seconds at `http://localhost:8080/nifi`
Evaluate and ensure the appropriate license headers are present on all source files. Ensure LICENSE and NOTICE files are complete and accurate.
Developers should always be keeping these up to date as they go along adding source and modifying dependencies to keep this burden manageable.
-This command `mvn install -Pcheck-licenses` should be run as well to help validate. If that doesn't complete cleanly it must be addressed.
+This command `mvn install -Pcontrib-check` should be run as well to help validate. If that doesn't complete cleanly it must be addressed.
-Now its time to have maven prepare the release so execute `mvn release:prepare -Psigned_release -DscmCommentPrefix="NIFI-270 " -Darguments="-DskipTests"`.
+Now its time to have maven prepare the release so execute `mvn release:prepare -Psigned_release -DscmCommentPrefix="NIFI-270-RC1 " -Darguments="-DskipTests"`.
Maven will ask:
-`What is the release version for "Apache NiFi NAR Plugin"? (org.apache.nifi:nifi-nar-maven-plugin) 0.0.1-incubating: :`
+`What is the release version for "Apache NiFi"? (org.apache.nifi:nifi) 0.0.1-incubating: :`
Just hit enter to accept the default.
Maven will then ask:
-`What is SCM release tag or label for "Apache NiFi NAR Plugin"? (org.apache.nifi:nifi-nar-maven-plugin) nifi-nar-maven-plugin-0.0.1-incubating: : `
+`What is SCM release tag or label for "Apache NiFi"? (org.apache.nifi:nifi) nifi-0.0.1-incubating: : `
-Enter `nifi-nar-maven-plugin-0.0.1-incubating-RC1` or whatever the appropriate release candidate (RC) number is.
+Enter `nifi-0.0.1-incubating-RC1` or whatever the appropriate release candidate (RC) number is.
Maven will then ask:
-`What is the new development version for "Apache NiFi NAR Plugin"? (org.apache.nifi:nifi-nifi-nar-maven-plugin) 0.0.2-incubating-SNAPSHOT: :`
+`What is the new development version for "Apache NiFi"? (org.apache.nifi:nifi) 0.0.2-incubating-SNAPSHOT: :`
Just hit enter to accept the default.
Now that preparation went perfectly it is time to perform the release and deploy artifacts to staging. To do that execute
-`mvn release:perform -Psigned_release -DscmCommentPrefix="NIFI-270 " -Darguments="-DskipTests"`
+`mvn release:perform -Psigned_release -DscmCommentPrefix="NIFI-270-RC1 " -Darguments="-DskipTests"`
That will complete successfully and this means the artifacts have been released to the Apache Nexus staging repository. You will see something like
@@ -174,6 +172,11 @@ Validate that all the various aspects of the staged artifacts appear correct
If all looks good then push the branch to origin `git push origin NIFI-270`
+If it is intended that convenience binaries will be provided for this release then the community has requested that
+a copy it be made available for reviewing of the release candidate. The convenience binary, its hashes, and signature
+ should be placed here:
+ - https://dist.apache.org/repos/dist/dev/incubator/nifi
+
If anything isn't correct about the staged artifacts you can drop the staged repo from repository.apache.org and delete the
local tag in git. If you also delete the local branch and clear your local maven repository under org/apache/nifi then it is
as if the release never happened. Before doing that though try to figure out what went wrong. So as described here you see
@@ -181,21 +184,21 @@ that you can pretty easily test the release process until you get it right. The
commands can come in handy to help do this so you can set versions to something clearly release test related.
Now it's time to initiate a vote within the PPMC. Send the vote request to `dev@nifi.incubator.apache.org`
-with a subject of `[VOTE] Release Apache NiFi nifi-nar-maven-plugin-0.0.1-incubating`. The following template can be used:
+with a subject of `[VOTE] Release Apache NiFi 0.0.1-incubating`. The following template can be used:
```
Hello
I am pleased to be calling this vote for the source release of Apache NiFi
-nifi-nar-maven-plugin-0.0.1-incubating.
+nifi-0.0.1-incubating.
The source zip, including signatures, digests, etc. can be found at:
https://repository.apache.org/content/repositories/orgapachenifi-1011
-The Git tag is nifi-nar-maven-plugin-0.0.1-incubating-RC1
+The Git tag is nifi-0.0.1-incubating-RC1
The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
-Checksums of nifi-nar-maven-plugin-0.0.1-incubating-source-release.zip:
+Checksums of nifi-0.0.1-incubating-source-release.zip:
MD5: 5a580756a17b0573efa3070c70585698
SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
@@ -211,19 +214,19 @@ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&versio
The vote will be open for 72 hours.
Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test. The please vote:
-[ ] +1 Release this package as nifi-nar-maven-plugin-0.0.1-incubating
+[ ] +1 Release this package as nifi-0.0.1-incubating
[ ] +0 no opinion
[ ] -1 Do not release this package because because...
```
<br/>
-A release vote is majority rule. So wait 72 hours and see if there are at least 3 binding +1 votes and no more negative votes than positive.
+A release vote is majority rule. So wait 72 hours and see if there are at least 3 binding (in the PPMC sense of binding) +1 votes and no more negative votes than positive.
If so forward the vote to the IPMC. Send the vote request to `general@incubator.apache.org` with a subject of
-`[VOTE] Release Apache NiFi nifi-nar-maven-plugin-0.0.1-incubating`. The following template can be used:
+`[VOTE] Release Apache NiFi 0.0.1-incubating`. The following template can be used:
```
Hello
-The Apache NiFi PPMC has voted to release Apache NiFi nar-maven-plugin-0.0.1-incubating.
+The Apache NiFi PPMC has voted to release Apache NiFi 0.0.1-incubating.
The vote was based on the release candidate and thread described below.
We now request the IPMC to vote on this release.
@@ -236,11 +239,11 @@ Here is the PPMC vote thread: [URL TO PPMC Vote Thread]
The source zip, including signatures, digests, etc. can be found at:
https://repository.apache.org/content/repositories/orgapachenifi-1011
-The Git tag is nar-maven-plugin-0.0.1-incubating-RC1
+The Git tag is nifi-0.0.1-incubating-RC1
The Git commit ID is 72abf18c2e045e9ef404050e2bffc9cef67d2558
https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git;a=commit;h=72abf18c2e045e9ef404050e2bffc9cef67d2558
-Checksums of nar-maven-plugin-0.0.1-incubating-source-release.zip:
+Checksums of nifi-0.0.1-incubating-source-release.zip:
MD5: 5a580756a17b0573efa3070c70585698
SHA1: a79ff8fd0d2f81523b675e4c69a7656160ff1214
@@ -256,13 +259,13 @@ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&versio
The vote will be open for 72 hours.
Please download the release candidate and evaluate the necessary items including checking hashes, signatures, build from source, and test. The please vote:
-[ ] +1 Release this package as nar-maven-plugin-0.0.1-incubating
+[ ] +1 Release this package as nifi-0.0.1-incubating
[ ] +0 no opinion
[ ] -1 Do not release this package because because...
```
<br/>
Wait 72 hours. If the vote passes then send a vote result email. Send the email to `general@incubator.apache.org, dev@nifi.incubator.apache.org`
-with a subject of `[RESULT][VOTE] Release Apache NiFi nar-maven-plugin-0.0.1-incubating`. Use a template such as:
+with a subject of `[RESULT][VOTE] Release Apache NiFi 0.0.1-incubating`. Use a template such as:
```
Hello
@@ -277,12 +280,69 @@ Thanks to all who helped make this release possible.
Here is the IPMC vote thread: [INSERT URL OF IPMC Vote Thread]
```
<br/>
-Now all the voting is done and the release is good to go. In repository.apache.org go to the staging repository
-and select `release`. Then publish the source, hashes, and signatures to `https://dist.apache.org/repos/dist/release/incubator/nifi/`
-Then merge the release git tag to develop and to master.
+Now all the voting is done and the release is good to go.
+
+Here are the steps of the release once the release is approved:
+
+1. Upload source-release artifacts to dist. If the release version is 0.0.1-incubating then upload them (zip, asc, md5, sha1) to
+`https://dist.apache.org/repos/dist/release/incubator/nifi/0.0.1-incubating`
+
+2. To produce binary convenience release build the application from the raw source in staging. For each binary convenience artifact:
+ - Generate ascii armored detached signature by running `gpg -a -b nifi-0.0.1-incubating-bin.tar.gz`
+ - Generate md5 hash summary by running `md5sum nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,32)}' > nifi-0.0.1-incubating-bin.tar.gz.md5`
+ - Generate sha1 hash summary by running `sha1sum nifi-0.0.1-incubating-bin.tar.gz | awk '{ printf substr($0,0,40)}' > nifi-0.0.1-incubating-bin.tar.gz.sha1`
+ - Upload the bin, asc, sha1, md5 for each binary convenience build to the same location as the source release
+
+3. In repository.apache.org go to the staging repository and select `release` and follow instructions on the site.
+
+4. Merge the release branch into master
+
+5. Merge the release branch into develop
+
+6. Update the NiFi website to point to the new download(s)
+
+7. Update the NiFi incubator status page to indicate NEWS of the release
+
+8. In Jira mark the release version as 'Released' and 'Archived' through 'version' management in the 'administration' console.
+
+9. Wait 24 hours then send release announcement.
+ - See [here][release-announce] for an understanding of why you need to wait 24 hours
+ - Then create an announcement like the one shown below addressed to 'announce@apache.org, general@incubator.apache.org, dev@nifi.incubator.apache.org' with a reply-to of 'general@incubator.apache.org'.
+ - The email has to be sent from an apache.org email address and should be by the release manager of the build.
+
+```
+SUBJECT: [ANNOUNCE] Apache NiFi 0.0.2-incubating release
+BODY:
+Hello
+
+The Apache NiFi team would like to announce the release of Apache NiFi 0.0.2-incubating.
+
+Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data. Apache NiFi was made for dataflow. It supports highly configurable directed graphs of data routing, transformation, and system mediation logic.
+
+More details on Apache NiFi can be found here:
+http://nifi.incubator.apache.org/
+
+The release artifacts can be downloaded from here:
+http://nifi.incubator.apache.org/downloads/
+
+Maven artifacts have been made available here:
+https://repository.apache.org/content/repositories/releases/org/apache/nifi/
+
+Release notes available here:
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12316020&version=12329373
+
+Thank you
+The Apache NiFi team
+
+----
+DISCLAIMER
+
+Apache NiFi is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+```
[quickstart-guide]: http://nifi.incubator.apache.org/development/quickstart.html
[release-manager]: http://www.apache.org/dev/release-publishing.html#release_manager
+[release-announce]: http://www.apache.org/dev/release.html#release-announcements
[apache-license]: http://apache.org/licenses/LICENSE-2.0
[apache-license-apply]: http://www.apache.org/dev/apply-license.html
[apache-legal-resolve]: http://www.apache.org/legal/resolved.html
[54/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare for next
development iteration
Posted by ma...@apache.org.
NIFI-429: prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fdc801bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fdc801bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fdc801bc
Branch: refs/heads/master
Commit: fdc801bc183b2435b658b3a7e3076ef45135e550
Parents: 65a07b6
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 14:21:29 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 14:21:29 2015 -0400
----------------------------------------------------------------------
nifi/nifi-api/pom.xml | 2 +-
nifi/nifi-assembly/pom.xml | 10 +--
nifi/nifi-bootstrap/pom.xml | 2 +-
.../nifi-data-provenance-utils/pom.xml | 2 +-
.../nifi-expression-language/pom.xml | 2 +-
.../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +-
.../nifi-hl7-query-language/pom.xml | 2 +-
nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +-
.../nifi-processor-utilities/pom.xml | 2 +-
nifi/nifi-commons/nifi-properties/pom.xml | 2 +-
nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +-
.../nifi-site-to-site-client/pom.xml | 4 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +-
nifi/nifi-commons/pom.xml | 2 +-
nifi/nifi-docs/pom.xml | 2 +-
nifi/nifi-external/nifi-spark-receiver/pom.xml | 2 +-
nifi/nifi-external/pom.xml | 2 +-
.../nifi-processor-bundle-archetype/pom.xml | 2 +-
nifi/nifi-maven-archetypes/pom.xml | 2 +-
nifi/nifi-mock/pom.xml | 2 +-
.../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 +-
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
.../nifi-framework-nar/pom.xml | 2 +-
.../nifi-framework/nifi-administration/pom.xml | 2 +-
.../nifi-framework/nifi-client-dto/pom.xml | 2 +-
.../nifi-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-framework/nifi-documentation/pom.xml | 2 +-
.../nifi-file-authorization-provider/pom.xml | 2 +-
.../nifi-framework-cluster-protocol/pom.xml | 2 +-
.../nifi-framework-cluster-web/pom.xml | 2 +-
.../nifi-framework-cluster/pom.xml | 2 +-
.../nifi-framework-core-api/pom.xml | 2 +-
.../nifi-framework/nifi-framework-core/pom.xml | 2 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../nifi-framework/nifi-runtime/pom.xml | 2 +-
.../nifi-framework/nifi-security/pom.xml | 2 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 2 +-
.../nifi-framework/nifi-user-actions/pom.xml | 2 +-
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +-
.../nifi-web/nifi-ui-extension/pom.xml | 2 +-
.../nifi-web/nifi-web-api/pom.xml | 2 +-
.../nifi-web/nifi-web-content-access/pom.xml | 2 +-
.../nifi-web/nifi-web-content-viewer/pom.xml | 2 +-
.../nifi-web/nifi-web-docs/pom.xml | 2 +-
.../nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web-optimistic-locking/pom.xml | 2 +-
.../nifi-web/nifi-web-security/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
.../nifi-framework/nifi-web/pom.xml | 12 +--
.../nifi-framework/pom.xml | 2 +-
.../nifi-framework-bundle/pom.xml | 38 ++++-----
.../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +-
.../nifi-geo-bundle/nifi-geo-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 4 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +-
.../nifi-hdfs-processors/pom.xml | 2 +-
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 2 +-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 4 +-
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 4 +-
nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +-
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +-
.../nifi-kafka-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +-
.../nifi-kite-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 4 +-
.../nifi-language-translation-nar/pom.xml | 4 +-
.../nifi-yandex-processors/pom.xml | 2 +-
.../nifi-language-translation-bundle/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-provenance-repository-nar/pom.xml | 2 +-
.../nifi-volatile-provenance-repository/pom.xml | 2 +-
.../nifi-provenance-repository-bundle/pom.xml | 6 +-
.../nifi-social-media-nar/pom.xml | 4 +-
.../nifi-twitter-processors/pom.xml | 2 +-
.../nifi-social-media-bundle/pom.xml | 2 +-
.../nifi-solr-bundle/nifi-solr-nar/pom.xml | 4 +-
.../nifi-solr-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml | 2 +-
.../nifi-standard-content-viewer/pom.xml | 2 +-
.../nifi-standard-nar/pom.xml | 2 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-standard-processors/pom.xml | 2 +-
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../nifi-standard-bundle/pom.xml | 10 +--
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-distributed-cache-protocol/pom.xml | 2 +-
.../nifi-distributed-cache-server/pom.xml | 2 +-
.../nifi-distributed-cache-services-nar/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-http-context-map-api/pom.xml | 2 +-
.../nifi-http-context-map-nar/pom.xml | 2 +-
.../nifi-http-context-map/pom.xml | 2 +-
.../nifi-http-context-map-bundle/pom.xml | 2 +-
.../nifi-load-distribution-service-api/pom.xml | 2 +-
.../nifi-ssl-context-nar/pom.xml | 2 +-
.../nifi-ssl-context-service/pom.xml | 2 +-
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../nifi-standard-services-api-nar/pom.xml | 2 +-
.../nifi-standard-services/pom.xml | 2 +-
.../nifi-update-attribute-model/pom.xml | 2 +-
.../nifi-update-attribute-nar/pom.xml | 2 +-
.../nifi-update-attribute-processor/pom.xml | 2 +-
.../nifi-update-attribute-ui/pom.xml | 2 +-
.../nifi-update-attribute-bundle/pom.xml | 8 +-
nifi/nifi-nar-bundles/pom.xml | 30 +++----
nifi/pom.xml | 84 ++++++++++----------
118 files changed, 219 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/pom.xml b/nifi/nifi-api/pom.xml
index cab5522..fc15629 100644
--- a/nifi/nifi-api/pom.xml
+++ b/nifi/nifi-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-assembly/pom.xml b/nifi/nifi-assembly/pom.xml
index d74c275..4a12b25 100644
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-assembly</artifactId>
<packaging>pom</packaging>
@@ -170,25 +170,25 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-bootstrap/pom.xml b/nifi/nifi-bootstrap/pom.xml
index c01c95e..6e467ba 100644
--- a/nifi/nifi-bootstrap/pom.xml
+++ b/nifi/nifi-bootstrap/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-bootstrap</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
index 1b1e383..df9164d 100644
--- a/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-data-provenance-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-data-provenance-utils</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-expression-language/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-expression-language/pom.xml b/nifi/nifi-commons/nifi-expression-language/pom.xml
index 18aad85..8e4aee5 100644
--- a/nifi/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi/nifi-commons/nifi-expression-language/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-expression-language</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
index a677f27..979980f 100644
--- a/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-flowfile-packager</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
index b7a72f2..455d107 100644
--- a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
+++ b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hl7-query-language</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-logging-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-logging-utils/pom.xml b/nifi/nifi-commons/nifi-logging-utils/pom.xml
index 2c86870..0a5c9b6 100644
--- a/nifi/nifi-commons/nifi-logging-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-logging-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-logging-utils</artifactId>
<description>Utilities for logging</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-processor-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-processor-utilities/pom.xml b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
index d19b40f..b06ce46 100644
--- a/nifi/nifi-commons/nifi-processor-utilities/pom.xml
+++ b/nifi/nifi-commons/nifi-processor-utilities/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-processor-utils</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-properties/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-properties/pom.xml b/nifi/nifi-commons/nifi-properties/pom.xml
index 7524085..455304d 100644
--- a/nifi/nifi-commons/nifi-properties/pom.xml
+++ b/nifi/nifi-commons/nifi-properties/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-properties</artifactId>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-security-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-security-utils/pom.xml b/nifi/nifi-commons/nifi-security-utils/pom.xml
index b4d3952..f621498 100644
--- a/nifi/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-security-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-utils</artifactId>
<description>Contains security functionality.</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
index 57843d0..98570d8 100644
--- a/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
+++ b/nifi/nifi-commons/nifi-site-to-site-client/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-site-to-site-client</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-client-dto</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-socket-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/pom.xml b/nifi/nifi-commons/nifi-socket-utils/pom.xml
index 7eee6a2..6eaad22 100644
--- a/nifi/nifi-commons/nifi-socket-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-socket-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-socket-utils</artifactId>
<description>Utilities for socket communication</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-utils/pom.xml b/nifi/nifi-commons/nifi-utils/pom.xml
index 3abc3fd..5110085 100644
--- a/nifi/nifi-commons/nifi-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-utils/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<!--
This project intentionally has no additional dependencies beyond that pulled in by the parent. It is a general purpose utility library
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-web-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-web-utils/pom.xml b/nifi/nifi-commons/nifi-web-utils/pom.xml
index 4f65929..53273b3 100644
--- a/nifi/nifi-commons/nifi-web-utils/pom.xml
+++ b/nifi/nifi-commons/nifi-web-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-web-utils</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
index 7393e85..2bdf065 100644
--- a/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
+++ b/nifi/nifi-commons/nifi-write-ahead-log/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-write-ahead-log</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-commons/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/pom.xml b/nifi/nifi-commons/pom.xml
index 8eeeaf1..d965e9e 100644
--- a/nifi/nifi-commons/pom.xml
+++ b/nifi/nifi-commons/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-docs/pom.xml b/nifi/nifi-docs/pom.xml
index b68ac5e..8ecd38a 100644
--- a/nifi/nifi-docs/pom.xml
+++ b/nifi/nifi-docs/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>nifi-docs</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-external/nifi-spark-receiver/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/nifi-spark-receiver/pom.xml b/nifi/nifi-external/nifi-spark-receiver/pom.xml
index 5d4cffa..6feac6d 100644
--- a/nifi/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi/nifi-external/nifi-spark-receiver/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-external</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-spark-receiver</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-external/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-external/pom.xml b/nifi/nifi-external/pom.xml
index 2f121d2..4d5a220 100644
--- a/nifi/nifi-external/pom.xml
+++ b/nifi/nifi-external/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-external</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
index 5cf6e5c..efbae51 100644
--- a/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
+++ b/nifi/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-maven-archetypes</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-processor-bundle-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-maven-archetypes/pom.xml b/nifi/nifi-maven-archetypes/pom.xml
index 1ffcd13..e18631d 100644
--- a/nifi/nifi-maven-archetypes/pom.xml
+++ b/nifi/nifi-maven-archetypes/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-maven-archetypes</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-mock/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-mock/pom.xml b/nifi/nifi-mock/pom.xml
index 474ab2d..0d0d660 100644
--- a/nifi/nifi-mock/pom.xml
+++ b/nifi/nifi-mock/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-mock</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
index 28de272..ccc268c 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
index 7975dff..6c0d6db 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 175ce25..937ceca 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
index 7a959b0..6938b03 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
index 5b12057..4230fae 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-administration</artifactId>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/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 409eb81..2eec0c3 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
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-client-dto</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
index be9b26b..e35aad6 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-cluster-authorization-provider</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
index e94a857..8ae18e7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-documentation</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
index 027629e..1dcd49f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorization-provider/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-file-authorization-provider</artifactId>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
index 0164e04..6a08ba5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-cluster-protocol</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
index 06f0cac..acef1ba 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-web/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-cluster-web</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
index bdeba34..d2d9e7f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-cluster</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
index 8ee1408..5f36598 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-core-api</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
index cfe4721..a9cbc67 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-core</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
index 25e39f9..05bb8d4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-nar-utils</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index 2747248..c2c98f3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-resources</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
index 4361505..04fe1be 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-runtime</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
index c8611bd..b40bdcb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-security</artifactId>
<description>Contains security functionality common to NiFi.</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
index a6f2527..90f467b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-site-to-site</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
index caffcd8..3818ace 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-user-actions</artifactId>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
index 864adf5..088ae44 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-custom-ui-utilities</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index acda853..cab6c46 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-jetty</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
index 5e75a06..87008eb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-ui-extension</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/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 9c47c8f..0bffa49 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
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index 9591562..7eddaa9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-access</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index 403a12c..3482324 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-viewer</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
index 28a4c2a..3c54fbe 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-docs</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
index ec4310d..002fb63 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-error</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
index f0cc68f..65b9a6e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-optimistic-locking</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
index bba2e5c..2cd83a5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-security</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index 2c5cd79..ecbae33 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-web-ui</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
index ac489e7..b903a84 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-web</artifactId>
<packaging>pom</packaging>
@@ -40,31 +40,31 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-api</artifactId>
<type>war</type>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-error</artifactId>
<type>war</type>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-docs</artifactId>
<type>war</type>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-viewer</artifactId>
<type>war</type>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-ui</artifactId>
<type>war</type>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
index 2a63e68..b59a51f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 4d9d981..31876d7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-bundle</artifactId>
<packaging>pom</packaging>
@@ -31,92 +31,92 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster-protocol</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster-web</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-file-authorization-provider</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cluster-authorization-provider</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-client-dto</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-access</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core-api</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-user-actions</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-administration</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-optimistic-locking</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-security</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-documentation</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
index aa53713..96bd599 100644
--- a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-geo-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
index c9fd4df..518c93b 100644
--- a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-geo-processors</artifactId>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
index b6af31f..921774a 100644
--- a/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-geo-bundle</artifactId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
index f3bfc08..61f5b07 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hadoop-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
index 135bd08..2694775 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hdfs-processors</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
index 9023400..68ff394 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hadoop-bundle</artifactId>
<packaging>pom</packaging>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hdfs-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
index 7f446df..554396d 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hadoop-libraries-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
index 1c68e48..b481e48 100644
--- a/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
index 58018af..ab43cf4 100644
--- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hl7-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
index 8f8eaf8..8d21510 100644
--- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hl7-processors</artifactId>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-query-language</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
index 6e613ae..efd6d76 100644
--- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-hl7-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
index 7c72d18..536dca2 100644
--- a/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-jetty-bundle</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
index b3c9eba..ffc87d6 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-kafka-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
index e39799d..7dfe720 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-kafka-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
index bca0b6c..971dde0 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-kafka-bundle</artifactId>
<packaging>pom</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
index 03791c4..c0fa0f4 100644
--- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-kite-nar</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
index d003db0..fc6e92d 100644
--- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-kite-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
index 94b9631..fe44705 100644
--- a/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-kite-bundle</artifactId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
index 0ac832b..f9aee3e 100644
--- a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-language-translation-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-yandex-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
index 2dc5830..e485d9d 100644
--- a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-yandex-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
index c85dadc..00b6317 100644
--- a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-language-translation-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
index d559d60..1545245 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-persistent-provenance-repository</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
index 8cffcc8..87aedcc 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-provenance-repository-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
index 4ae92d1..e1f1e62 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-volatile-provenance-repository</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
index 68d0971..574beb6 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-provenance-repository-bundle</artifactId>
<packaging>pom</packaging>
@@ -31,12 +31,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-persistent-provenance-repository</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-volatile-provenance-repository</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
[15/54] [abbrv] incubator-nifi git commit: NIFI-433 addressed the
lack of license headers in a couple test files
Posted by ma...@apache.org.
NIFI-433 addressed the lack of license headers in a couple test files
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/34c81e1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/34c81e1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/34c81e1e
Branch: refs/heads/master
Commit: 34c81e1e70b0314da27150bd4e824024e53da206
Parents: 4f35637
Author: joewitt <jo...@apache.org>
Authored: Sat May 2 16:43:32 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Sat May 2 16:43:32 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/util/NiFiPropertiesTest.java | 16 ++++++++++++++++
.../java/org/apache/nifi/nar/NarUnpackerTest.java | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/34c81e1e/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java b/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
index 58fbbf3..344c740 100644
--- a/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
+++ b/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.nifi.util;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/34c81e1e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
index fa3cd62..33b988d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
package org.apache.nifi.nar;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
[50/54] [abbrv] incubator-nifi git commit: NIFI-429: updated pom to
point to release nifi artifacts
Posted by ma...@apache.org.
NIFI-429: updated pom to point to release nifi artifacts
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/32909ead
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/32909ead
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/32909ead
Branch: refs/heads/master
Commit: 32909ead21130269c22c74c3a9e3ea1c2c54dc7e
Parents: 0cc481d
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 14:13:42 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 14:13:42 2015 -0400
----------------------------------------------------------------------
nifi/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/32909ead/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 7444403..45f8b3f 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parent</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<relativePath />
</parent>
<artifactId>nifi</artifactId>
@@ -874,7 +874,7 @@
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-maven-plugin</artifactId>
- <version>1.0.1-incubating-SNAPSHOT</version>
+ <version>1.0.1-incubating</version>
<extensions>true</extensions>
</plugin>
</plugins>
[12/54] [abbrv] incubator-nifi git commit: NIFI-557 fixed the correct
test and removed extraneous/duplicative ones - build now works
Posted by ma...@apache.org.
NIFI-557 fixed the correct test and removed extraneous/duplicative ones - build now works
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4f35637a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4f35637a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4f35637a
Branch: refs/heads/master
Commit: 4f35637a297640e6274771e23c1960f748196350
Parents: 7853e3c
Author: joewitt <jo...@apache.org>
Authored: Fri May 1 16:17:47 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Sat May 2 16:03:28 2015 -0400
----------------------------------------------------------------------
.../protocol/impl/ClusterManagerProtocolSenderImplTest.java | 9 +++------
.../cluster/protocol/impl/SocketProtocolListenerTest.java | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4f35637a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
index ab10b01..5bfb5ed 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterManagerProtocolSenderImplTest.java
@@ -41,9 +41,6 @@ import static org.mockito.Mockito.when;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-/**
- * @author unattributed
- */
public class ClusterManagerProtocolSenderImplTest {
private InetAddress address;
@@ -90,7 +87,7 @@ public class ClusterManagerProtocolSenderImplTest {
when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(new FlowResponseMessage());
FlowRequestMessage request = new FlowRequestMessage();
- request.setNodeId(new NodeIdentifier("id", "api-address", 1, address.getHostAddress(), port));
+ request.setNodeId(new NodeIdentifier("id", "api-address", 1, "localhost", port));
FlowResponseMessage response = sender.requestFlow(request);
assertNotNull(response);
}
@@ -101,7 +98,7 @@ public class ClusterManagerProtocolSenderImplTest {
when(mockHandler.canHandle(any(ProtocolMessage.class))).thenReturn(Boolean.TRUE);
when(mockHandler.handle(any(ProtocolMessage.class))).thenReturn(new PingMessage());
FlowRequestMessage request = new FlowRequestMessage();
- request.setNodeId(new NodeIdentifier("id", "api-address", 1, address.getHostAddress(), port));
+ request.setNodeId(new NodeIdentifier("id", "api-address", 1, "localhost", port));
try {
sender.requestFlow(request);
fail("failed to throw exception");
@@ -125,7 +122,7 @@ public class ClusterManagerProtocolSenderImplTest {
}
});
FlowRequestMessage request = new FlowRequestMessage();
- request.setNodeId(new NodeIdentifier("id", "api-address", 1, address.getHostAddress(), port));
+ request.setNodeId(new NodeIdentifier("id", "api-address", 1, "localhost", port));
try {
sender.requestFlow(request);
fail("failed to throw exception");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4f35637a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
index 7a91c29..bc10c20 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/SocketProtocolListenerTest.java
@@ -27,8 +27,8 @@ import org.apache.nifi.cluster.protocol.jaxb.JaxbProtocolContext;
import org.apache.nifi.cluster.protocol.jaxb.message.JaxbProtocolUtils;
import org.apache.nifi.cluster.protocol.message.PingMessage;
import org.apache.nifi.cluster.protocol.message.ProtocolMessage;
-import org.apache.nifi.cluster.protocol.testutils.DelayedProtocolHandler;
-import org.apache.nifi.cluster.protocol.testutils.ReflexiveProtocolHandler;
+import org.apache.nifi.cluster.protocol.impl.testutils.DelayedProtocolHandler;
+import org.apache.nifi.cluster.protocol.impl.testutils.ReflexiveProtocolHandler;
import org.apache.nifi.io.socket.ServerSocketConfiguration;
import org.apache.nifi.io.socket.SocketConfiguration;
import org.apache.nifi.io.socket.SocketUtils;
[33/54] [abbrv] incubator-nifi git commit: NIFI-593 Providing Set
semantics for those comparisons where ordering is neither guaranteed nor
required to be correct.
Posted by ma...@apache.org.
NIFI-593 Providing Set semantics for those comparisons where ordering is neither guaranteed nor required to be correct.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/13819204
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/13819204
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/13819204
Branch: refs/heads/master
Commit: 1381920479e4f1403646997c782304e3a8b36854
Parents: 3472bf3
Author: Aldrin Piri <al...@apache.org>
Authored: Wed May 6 09:01:19 2015 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed May 6 09:04:03 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/util/NiFiPropertiesTest.java | 23 +++++++++++-----
.../org/apache/nifi/nar/NarUnpackerTest.java | 29 ++++++++++++--------
2 files changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/13819204/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java b/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
index 344c740..0751275 100644
--- a/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
+++ b/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.nifi.util;
-import static org.junit.Assert.assertEquals;
+import org.junit.Assert;
+import org.junit.Test;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.nio.file.Path;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
public class NiFiPropertiesTest {
@@ -36,13 +39,19 @@ public class NiFiPropertiesTest {
assertEquals("UI Banner Text", properties.getBannerText());
- List<Path> directories = properties.getNarLibraryDirectories();
+ Set<File> expectedDirectories = new HashSet<>();
+ expectedDirectories.add(new File("./target/resources/NiFiProperties/lib/"));
+ expectedDirectories.add(new File("./target/resources/NiFiProperties/lib2/"));
- assertEquals(new File("./target/resources/NiFiProperties/lib/").getPath(),
- directories.get(0).toString());
- assertEquals(new File("./target/resources/NiFiProperties/lib2/").getPath(), directories
- .get(1).toString());
+ Set<String> directories = new HashSet<>();
+ for (Path narLibDir : properties.getNarLibraryDirectories()) {
+ directories.add(narLibDir.toString());
+ }
+ Assert.assertEquals("Did not have the anticipated number of directories", expectedDirectories.size(), directories.size());
+ for (File expectedDirectory : expectedDirectories) {
+ Assert.assertTrue("Listed directories did not contain expected directory", directories.contains(expectedDirectory.getPath()));
+ }
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/13819204/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
index 33b988d..66e167e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.nifi.nar;
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.nifi.util.NiFiProperties;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
import java.io.BufferedInputStream;
import java.io.File;
@@ -32,10 +32,13 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
+import java.util.HashSet;
+import java.util.Set;
-import org.apache.nifi.util.NiFiProperties;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
public class NarUnpackerTest {
@@ -92,13 +95,17 @@ public class NarUnpackerTest {
"org.apache.nifi.processors.dummy.one"));
assertTrue(extensionMapping.getAllExtensionNames().contains(
"org.apache.nifi.processors.dummy.two"));
-
final File extensionsWorkingDir = properties.getExtensionsWorkingDirectory();
File[] extensionFiles = extensionsWorkingDir.listFiles();
- assertEquals(2, extensionFiles.length);
- assertEquals("dummy-one.nar-unpacked", extensionFiles[0].getName());
- assertEquals("dummy-two.nar-unpacked", extensionFiles[1].getName());
+ Set<String> expectedNars = new HashSet<>();
+ expectedNars.add("dummy-one.nar-unpacked");
+ expectedNars.add("dummy-two.nar-unpacked");
+ assertEquals(expectedNars.size(), extensionFiles.length);
+
+ for (File extensionFile : extensionFiles) {
+ Assert.assertTrue(expectedNars.contains(extensionFile.getName()));
+ }
}
@Test
[53/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare for next
development iteration
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
index 64403a9..85d317f 100644
--- a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-social-media-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-twitter-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index ab4f020..5318226 100644
--- a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-twitter-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
index ee30048..a4a7787 100644
--- a/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-social-media-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
index 3c1009a..6379b6b 100644
--- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-solr-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
index 3a862d2..c396e5b 100644
--- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-solr-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
index 027806b..2d072ad 100644
--- a/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-solr-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
index 474972e..a54fa93 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-content-viewer</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
index d02e910..b7fbeb6 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
index 4bdadcf..78b9a15 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 134d589..e007838 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-processors</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
index 5abbab2..975b10f 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-reporting-tasks</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 83601ea..572861d 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-bundle</artifactId>
<packaging>pom</packaging>
@@ -35,23 +35,23 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-processors</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-reporting-tasks</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-content-viewer</artifactId>
<type>war</type>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
index 859de29..84757ef 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
index d673adf..bd9797c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-client-service</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
index 8607357..39580c2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-protocol</artifactId>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
index 9230603..f572922 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-server</artifactId>
<description>Provides a Controller Service for hosting Distributed Caches</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
index 86e881e..b9f8e7d 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-services-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
index a174ff3..654488c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
index 136165c..1d9b1f4 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-http-context-map-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
index 4ad8d6a..b022572 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-http-context-map-nar</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
index 3c68252..680dbfd 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-http-context-map</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
index 359aca8..83510d9 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-http-context-map-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
index 13dea5c..0a2e962 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-load-distribution-service-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
index b3b2613..16217ca 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-ssl-context-service-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
index dcc35bf..24706f7 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-ssl-context-service</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
index ed41095..76f7e69 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-ssl-context-bundle</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
index c1cec41..60c9246 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-ssl-context-service-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
index 98c0196..b3a6c80 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-services-api-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
index 8ae78ed..083fb26 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-services</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
index e49e64a..4bce547 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-model</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
index eec4b3d..67566de 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-update-attribute-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
index 837f8f8..1b5be60 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-processor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
index b54b1d6..a282283 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-update-attribute-ui</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
index 8a269ee..9b0179c 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>nifi-update-attribute-bundle</artifactId>
<packaging>pom</packaging>
@@ -34,18 +34,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-model</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-processor</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-ui</artifactId>
<type>war</type>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/nifi-nar-bundles/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml
index aeb0de4..21d0234 100644
--- a/nifi/nifi-nar-bundles/pom.xml
+++ b/nifi/nifi-nar-bundles/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
@@ -46,81 +46,81 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-load-distribution-service-api</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-api</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-protocol</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-server</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-volatile-provenance-repository</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- The following dependencies are marked provided because they must be provided by the container. Nars can assume they are there-->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fdc801bc/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 4faa21d..ebb9aa3 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -22,7 +22,7 @@
<relativePath />
</parent>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Apache NiFi(incubating) is an easy to use, powerful, and reliable system to process and distribute data.</description>
<modules>
@@ -609,67 +609,67 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-client</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-custom-ui-utilities</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ui-extension</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flowfile-packager</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-socket-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-bootstrap</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-resources</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<classifier>resources</classifier>
<scope>runtime</scope>
<type>zip</type>
@@ -677,7 +677,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-docs</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<classifier>resources</classifier>
<scope>runtime</scope>
<type>zip</type>
@@ -685,146 +685,146 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-nar</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-logging-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-processor-utils</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-write-ahead-log</artifactId>
- <version>0.1.0-incubating</version>
+ <version>0.1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
@@ -879,8 +879,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>nifi-0.1.0-incubating-rc13</tag>
- </scm>
</project>
[09/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
index 458a2b3..132456c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PreviousValueDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -34,6 +35,9 @@ public class PreviousValueDTO {
/**
* @return previous value
*/
+ @ApiModelProperty(
+ value = "The previous value."
+ )
public String getPreviousValue() {
return previousValue;
}
@@ -46,6 +50,9 @@ public class PreviousValueDTO {
* @return when it was modified
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when the value was modified."
+ )
public Date getTimestamp() {
return timestamp;
}
@@ -57,6 +64,9 @@ public class PreviousValueDTO {
/**
* @return user who changed the previous value
*/
+ @ApiModelProperty(
+ value = "The user who changed the previous value."
+ )
public String getUserName() {
return userName;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
index f9a6551..93c4ea9 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -51,6 +52,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
*
* @return The name of this Process Group
*/
+ @ApiModelProperty(
+ value = "The name of the process group."
+ )
public String getName() {
return name;
}
@@ -64,6 +68,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
*
* @return This Process Group's parent
*/
+ @ApiModelProperty(
+ value = "The part of the process group."
+ )
public ProcessGroupDTO getParent() {
return parent;
}
@@ -75,6 +82,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return comments for this process group
*/
+ @ApiModelProperty(
+ value = "The comments for the process group."
+ )
public String getComments() {
return comments;
}
@@ -86,6 +96,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return contents of this process group. This field will be populated if the request is marked verbose
*/
+ @ApiModelProperty(
+ value = "The contents of this process group. This field will be populated if the request is marked verbose."
+ )
public FlowSnippetDTO getContents() {
return contents;
}
@@ -97,6 +110,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of input ports contained in this process group
*/
+ @ApiModelProperty(
+ value = "The number of input ports in the process group."
+ )
public Integer getInputPortCount() {
return inputPortCount;
}
@@ -108,6 +124,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of invalid components in this process group
*/
+ @ApiModelProperty(
+ value = "The number of invalid components in the process group."
+ )
public Integer getInvalidCount() {
return invalidCount;
}
@@ -119,6 +138,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of output ports in this process group
*/
+ @ApiModelProperty(
+ value = "The number of output ports in the process group."
+ )
public Integer getOutputPortCount() {
return outputPortCount;
}
@@ -130,6 +152,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return Used in requests, indicates whether this process group should be running
*/
+ @ApiModelProperty(
+ value = "Used in requests, indicates whether the process group should be running."
+ )
public Boolean isRunning() {
return running;
}
@@ -141,6 +166,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of running component in this process group
*/
+ @ApiModelProperty(
+ value = "The number of running componetns in this process group."
+ )
public Integer getRunningCount() {
return runningCount;
}
@@ -152,6 +180,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of stopped components in this process group
*/
+ @ApiModelProperty(
+ value = "The number of stopped components in the process group."
+ )
public Integer getStoppedCount() {
return stoppedCount;
}
@@ -163,6 +194,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of disabled components in this process group
*/
+ @ApiModelProperty(
+ value = "The number of disabled components in the process group."
+ )
public Integer getDisabledCount() {
return disabledCount;
}
@@ -174,6 +208,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of active remote ports in this process group
*/
+ @ApiModelProperty(
+ value = "The number of active remote ports in the process group."
+ )
public Integer getActiveRemotePortCount() {
return activeRemotePortCount;
}
@@ -185,6 +222,9 @@ public class ProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of inactive remote ports in this process group
*/
+ @ApiModelProperty(
+ value = "The number of inactive remote ports in the process group."
+ )
public Integer getInactiveRemotePortCount() {
return inactiveRemotePortCount;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
index 1832ce3..ec5df96 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorConfigDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Map;
import java.util.Set;
@@ -58,6 +59,9 @@ public class ProcessorConfigDTO {
*
* @return The scheduling period
*/
+ @ApiModelProperty(
+ value = "The frequency with which to schedule the processor. The format of the value will depend on th value of schedulingStrategy."
+ )
public String getSchedulingPeriod() {
return schedulingPeriod;
}
@@ -71,6 +75,9 @@ public class ProcessorConfigDTO {
*
* @return scheduling strategy
*/
+ @ApiModelProperty(
+ value = "Indcates whether the prcessor should be scheduled to run in event or timer driven mode."
+ )
public String getSchedulingStrategy() {
return schedulingStrategy;
}
@@ -80,8 +87,11 @@ public class ProcessorConfigDTO {
}
/**
- * @return the amount of time that is used when this processor penalizes a flow file
+ * @return the amount of time that is used when this processor penalizes a flowfile
*/
+ @ApiModelProperty(
+ value = "The amout of time that is used when the process penalizes a flowfile."
+ )
public String getPenaltyDuration() {
return penaltyDuration;
}
@@ -91,8 +101,11 @@ public class ProcessorConfigDTO {
}
/**
- * @return amount of time must elaspe before this processor is scheduled again when yielding
+ * @return amount of time must elapse before this processor is scheduled again when yielding
*/
+ @ApiModelProperty(
+ value = "The amount of time that must elapse before this processor is scheduled again after yielding."
+ )
public String getYieldDuration() {
return yieldDuration;
}
@@ -104,6 +117,9 @@ public class ProcessorConfigDTO {
/**
* @return the level at this this processor will report bulletins
*/
+ @ApiModelProperty(
+ value = "The level at which the processor will report bulletins."
+ )
public String getBulletinLevel() {
return bulletinLevel;
}
@@ -117,6 +133,9 @@ public class ProcessorConfigDTO {
*
* @return the concurrently schedulable task count
*/
+ @ApiModelProperty(
+ value = "The number of tasks that should be concurrently schedule for the processor. If the processor doesn't allow parallol processing then any positive input will be ignored."
+ )
public Integer getConcurrentlySchedulableTaskCount() {
return concurrentlySchedulableTaskCount;
}
@@ -128,6 +147,9 @@ public class ProcessorConfigDTO {
/**
* @return whether or not this Processor is Loss Tolerant
*/
+ @ApiModelProperty(
+ value = "Whether the processor is loss tolerant."
+ )
public Boolean isLossTolerant() {
return lossTolerant;
}
@@ -139,6 +161,9 @@ public class ProcessorConfigDTO {
/**
* @return the comments
*/
+ @ApiModelProperty(
+ value = "The comments for the processor."
+ )
public String getComments() {
return comments;
}
@@ -153,6 +178,9 @@ public class ProcessorConfigDTO {
*
* @return The optional properties
*/
+ @ApiModelProperty(
+ value = "The properties for the processor. Properties whose value is not set will only contain the property name."
+ )
public Map<String, String> getProperties() {
return properties;
}
@@ -164,6 +192,9 @@ public class ProcessorConfigDTO {
/**
* @return descriptors for this processor's properties
*/
+ @ApiModelProperty(
+ value = "Descriptors for the processor's properties."
+ )
public Map<String, PropertyDescriptorDTO> getDescriptors() {
return descriptors;
}
@@ -177,6 +208,9 @@ public class ProcessorConfigDTO {
*
* @return The annotation data
*/
+ @ApiModelProperty(
+ value = "The annotation data for the processor used to relay configuration between a custom UI and the procesosr."
+ )
public String getAnnotationData() {
return annotationData;
}
@@ -188,6 +222,9 @@ public class ProcessorConfigDTO {
/**
* @return the URL for this processors custom configuration UI if applicable. Null otherwise.
*/
+ @ApiModelProperty(
+ value = "The URL for the processor's custom configuration UI if applicable."
+ )
public String getCustomUiUrl() {
return customUiUrl;
}
@@ -199,6 +236,9 @@ public class ProcessorConfigDTO {
/**
* @return the names of all processor relationships that cause a flow file to be terminated if the relationship is not connected to anything
*/
+ @ApiModelProperty(
+ value = "The names of all relationships that cause a flow file to be terminated if the relationship is not connected elsewhere."
+ )
public Set<String> getAutoTerminatedRelationships() {
return autoTerminatedRelationships;
}
@@ -210,6 +250,9 @@ public class ProcessorConfigDTO {
/**
* @return maps default values for concurrent tasks for each applicable scheduling strategy.
*/
+ @ApiModelProperty(
+ value = "Maps default values for concurrent tasks for each applicable scheduling strategy."
+ )
public Map<String, String> getDefaultConcurrentTasks() {
return defaultConcurrentTasks;
}
@@ -221,6 +264,9 @@ public class ProcessorConfigDTO {
/**
* @return run duration in milliseconds
*/
+ @ApiModelProperty(
+ value = "The run duration for the processor in milliseconds."
+ )
public Long getRunDurationMillis() {
return runDurationMillis;
}
@@ -232,6 +278,9 @@ public class ProcessorConfigDTO {
/**
* @return Maps default values for scheduling period for each applicable scheduling strategy
*/
+ @ApiModelProperty(
+ value = "Maps default values for scheduling period for each applicable scheduling strategy."
+ )
public Map<String, String> getDefaultSchedulingPeriod() {
return defaultSchedulingPeriod;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
index b80db70..c65c46a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -49,6 +50,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
*
* @return This processors name
*/
+ @ApiModelProperty(
+ value = "The name of the processor."
+ )
public String getName() {
return name;
}
@@ -62,6 +66,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
*
* @return This processors type
*/
+ @ApiModelProperty(
+ value = "The type of the processor."
+ )
public String getType() {
return type;
}
@@ -73,6 +80,10 @@ public class ProcessorDTO extends NiFiComponentDTO {
/**
* @return The state of this processor. Possible states are 'RUNNING', 'STOPPED', and 'DISABLED'
*/
+ @ApiModelProperty(
+ value = "The state of the processor",
+ allowableValues = "RUNNING, STOPPED, DISABLED"
+ )
public String getState() {
return state;
}
@@ -84,6 +95,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
/**
* @return The styles for this processor. (Currently only supports color)
*/
+ @ApiModelProperty(
+ value = "Styles for the processor (background-color => #eee)."
+ )
public Map<String, String> getStyle() {
return style;
}
@@ -95,6 +109,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
/**
* @return whether this processor supports parallel processing
*/
+ @ApiModelProperty(
+ value = "Whether the processor supports parallel processing."
+ )
public Boolean getSupportsParallelProcessing() {
return supportsParallelProcessing;
}
@@ -106,6 +123,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
/**
* @return whether this processor supports event driven scheduling
*/
+ @ApiModelProperty(
+ value = "Whether the processor supports event driven scheduling."
+ )
public Boolean getSupportsEventDriven() {
return supportsEventDriven;
}
@@ -119,6 +139,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
*
* @return The available relationships
*/
+ @ApiModelProperty(
+ value = "The available relationships that the processor currently supports."
+ )
public List<RelationshipDTO> getRelationships() {
return relationships;
}
@@ -132,6 +155,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
*
* @return The processor configuration details
*/
+ @ApiModelProperty(
+ value = "The configuration details for the processor. These details will be included in a resopnse if the verbose flag is included in a request."
+ )
public ProcessorConfigDTO getConfig() {
return config;
}
@@ -145,6 +171,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
*
* @return The validation errors
*/
+ @ApiModelProperty(
+ value = "The validation errors for the processor. These validation errors represent the problems with the processor that must be resolved before it can be started."
+ )
public Collection<String> getValidationErrors() {
return validationErrors;
}
@@ -156,6 +185,9 @@ public class ProcessorDTO extends NiFiComponentDTO {
/**
* @return the description for this processor
*/
+ @ApiModelProperty(
+ value = "The description of the processor."
+ )
public String getDescription() {
return description;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
index 02a55a7..dae16f2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyDescriptorDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -39,6 +40,9 @@ public class PropertyDescriptorDTO {
/**
* @return set of allowable values for this property. If empty then the allowable values are not constrained
*/
+ @ApiModelProperty(
+ value = "Allowable values for the property. If empty then the allowed values are not constrained."
+ )
public List<AllowableValueDTO> getAllowableValues() {
return allowableValues;
}
@@ -50,6 +54,9 @@ public class PropertyDescriptorDTO {
/**
* @return default value for this property
*/
+ @ApiModelProperty(
+ value = "The default value for the property."
+ )
public String getDefaultValue() {
return defaultValue;
}
@@ -61,6 +68,9 @@ public class PropertyDescriptorDTO {
/**
* @return An explanation of the meaning of the given property. This description is meant to be displayed to a user or simply provide a mechanism of documenting intent
*/
+ @ApiModelProperty(
+ value = "The descriptoin for the property. Used to relay additional details to a user or provide a mechanism of documenting intent."
+ )
public String getDescription() {
return description;
}
@@ -72,6 +82,9 @@ public class PropertyDescriptorDTO {
/**
* @return property name
*/
+ @ApiModelProperty(
+ value = "The name for the property."
+ )
public String getName() {
return name;
}
@@ -83,6 +96,9 @@ public class PropertyDescriptorDTO {
/**
* @return human-readable name to display to users
*/
+ @ApiModelProperty(
+ value = "The human readable name for the property."
+ )
public String getDisplayName() {
return displayName;
}
@@ -94,6 +110,9 @@ public class PropertyDescriptorDTO {
/**
* @return whether the property is required for this processor
*/
+ @ApiModelProperty(
+ value = "Whether the property is required."
+ )
public boolean isRequired() {
return required;
}
@@ -105,6 +124,9 @@ public class PropertyDescriptorDTO {
/**
* @return indicates that the value for this property should be considered sensitive and protected whenever stored or represented
*/
+ @ApiModelProperty(
+ value = "Whether the property is sensitive and protected whenever stored or represented."
+ )
public boolean isSensitive() {
return sensitive;
}
@@ -116,6 +138,9 @@ public class PropertyDescriptorDTO {
/**
* @return indicates whether this property is dynamic
*/
+ @ApiModelProperty(
+ value = "Whether the property is dynamic (user-defined)."
+ )
public boolean isDynamic() {
return dynamic;
}
@@ -127,6 +152,9 @@ public class PropertyDescriptorDTO {
/**
* @return specifies whether or not this property support expression language
*/
+ @ApiModelProperty(
+ value = "Whether the property supports expression language."
+ )
public boolean getSupportsEl() {
return supportsEl;
}
@@ -138,6 +166,9 @@ public class PropertyDescriptorDTO {
/**
* @return if this property identifies a controller service, this returns the fully qualified type, null otherwise
*/
+ @ApiModelProperty(
+ value = "If the property identifies a controller service, this returns the fully qualified type."
+ )
public String getIdentifiesControllerService() {
return identifiesControllerService;
}
@@ -159,6 +190,9 @@ public class PropertyDescriptorDTO {
/**
* @return the human-readable value that is allowed for this PropertyDescriptor
*/
+ @ApiModelProperty(
+ value = "A human readable value that is allowed for the property descriptor."
+ )
public String getDisplayName() {
return displayName;
}
@@ -170,6 +204,9 @@ public class PropertyDescriptorDTO {
/**
* @return the value for this allowable value
*/
+ @ApiModelProperty(
+ value = "A value that is allowed for the property descriptor."
+ )
public String getValue() {
return value;
}
@@ -181,6 +218,9 @@ public class PropertyDescriptorDTO {
/**
* @return a description of this Allowable Value, or <code>null</code> if no description is given
*/
+ @ApiModelProperty(
+ value = "A description for this allowable value."
+ )
public String getDescription() {
return description;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
index 5dc5b99..35c8293 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/PropertyHistoryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -30,6 +31,9 @@ public class PropertyHistoryDTO {
/**
* @return previous values
*/
+ @ApiModelProperty(
+ value = "Previous values for a given property."
+ )
public List<PreviousValueDTO> getPreviousValues() {
return previousValues;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
index a9fbfc6..ff5729a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RelationshipDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -31,6 +32,9 @@ public class RelationshipDTO {
/**
* @return the relationship name
*/
+ @ApiModelProperty(
+ value = "The relationship name."
+ )
public String getName() {
return name;
}
@@ -42,6 +46,9 @@ public class RelationshipDTO {
/**
* @return the relationship description
*/
+ @ApiModelProperty(
+ value = "The relationship description."
+ )
public String getDescription() {
return description;
}
@@ -53,6 +60,9 @@ public class RelationshipDTO {
/**
* @return true if relationship is auto terminated;false otherwise
*/
+ @ApiModelProperty(
+ value = "Whether or not flowfiles sent to this relationship should auto terminate."
+ )
public Boolean isAutoTerminate() {
return autoTerminate;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
index 3645eb8..261a844 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupContentsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -31,6 +32,9 @@ public class RemoteProcessGroupContentsDTO {
/**
* @return Controller Input Ports to which data can be sent
*/
+ @ApiModelProperty(
+ value = "The input ports to which data can be sent."
+ )
public Set<RemoteProcessGroupPortDTO> getInputPorts() {
return inputPorts;
}
@@ -42,6 +46,9 @@ public class RemoteProcessGroupContentsDTO {
/**
* @return Controller Output Ports from which data can be retrieved
*/
+ @ApiModelProperty(
+ value = "The output ports from which data can be retrieved."
+ )
public Set<RemoteProcessGroupPortDTO> getOutputPorts() {
return outputPorts;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
index b30320a..2e30001 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -69,6 +70,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return target uri of this remote process group
*/
+ @ApiModelProperty(
+ value = "The target URI of the remote process group."
+ )
public String getTargetUri() {
return this.targetUri;
}
@@ -76,6 +80,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @param name of this remote process group
*/
+ @ApiModelProperty(
+ value = "The name of the remote process group."
+ )
public void setName(final String name) {
this.name = name;
}
@@ -87,6 +94,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return Comments for this remote process group
*/
+ @ApiModelProperty(
+ value = "The comments for the remote process group."
+ )
public String getComments() {
return comments;
}
@@ -98,6 +108,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return any remote authorization issues for this remote process group
*/
+ @ApiModelProperty(
+ value = "Any remote authorization issues for the remote process group."
+ )
public List<String> getAuthorizationIssues() {
return authorizationIssues;
}
@@ -109,6 +122,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return whether or not this remote process group is actively transmitting
*/
+ @ApiModelProperty(
+ value = "Whether the remote process group is actively transmitting."
+ )
public Boolean isTransmitting() {
return transmitting;
}
@@ -120,6 +136,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return whether or not the target is running securely
*/
+ @ApiModelProperty(
+ value = "Whether the target is running securely."
+ )
public Boolean isTargetSecure() {
return targetSecure;
}
@@ -131,6 +150,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return the time period used for the timeout when communicating with this RemoteProcessGroup
*/
+ @ApiModelProperty(
+ value = "The time period used for the timeout when commicating with the target."
+ )
public String getCommunicationsTimeout() {
return communicationsTimeout;
}
@@ -140,8 +162,11 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
}
/**
- * @return when yielding, this amount of time must elaspe before this remote process group is scheduled again
+ * @return when yielding, this amount of time must elapse before this remote process group is scheduled again
*/
+ @ApiModelProperty(
+ value = "When yielding, this amount of time must elapse before the remote process group is scheduled again."
+ )
public String getYieldDuration() {
return yieldDuration;
}
@@ -153,6 +178,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of active remote input ports
*/
+ @ApiModelProperty(
+ value = "The number of active remote input ports."
+ )
public Integer getActiveRemoteInputPortCount() {
return activeRemoteInputPortCount;
}
@@ -164,6 +192,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of inactive remote input ports
*/
+ @ApiModelProperty(
+ value = "The number of inactive remote input ports."
+ )
public Integer getInactiveRemoteInputPortCount() {
return inactiveRemoteInputPortCount;
}
@@ -175,6 +206,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of active remote output ports
*/
+ @ApiModelProperty(
+ value = "The number of acitve remote output ports."
+ )
public Integer getActiveRemoteOutputPortCount() {
return activeRemoteOutputPortCount;
}
@@ -186,6 +220,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of inactive remote output ports
*/
+ @ApiModelProperty(
+ value = "The number of inactive remote output ports."
+ )
public Integer getInactiveRemoteOutputPortCount() {
return inactiveRemoteOutputPortCount;
}
@@ -197,6 +234,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of Remote Input Ports currently available in the remote NiFi instance
*/
+ @ApiModelProperty(
+ value = "The number of remote input ports currently available on the target."
+ )
public Integer getInputPortCount() {
return inputPortCount;
}
@@ -208,6 +248,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return number of Remote Output Ports currently available in the remote NiFi instance
*/
+ @ApiModelProperty(
+ value = "The number of remote output ports currently available on the target."
+ )
public Integer getOutputPortCount() {
return outputPortCount;
}
@@ -219,6 +262,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
/**
* @return contents of this remote process group. Will contain available input/output ports
*/
+ @ApiModelProperty(
+ value = "The contents of the remote process group. Will contain available input/output ports."
+ )
public RemoteProcessGroupContentsDTO getContents() {
return contents;
}
@@ -231,6 +277,9 @@ public class RemoteProcessGroupDTO extends NiFiComponentDTO {
* @return the flow for this remote group was last refreshed
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when this remote process group was last refreshed."
+ )
public Date getFlowRefreshed() {
return flowRefreshed;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
index 07f8ced..e4a8131 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RemoteProcessGroupPortDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -38,6 +39,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return comments as configured in the target port
*/
+ @ApiModelProperty(
+ value = "The comments as configured on the target port."
+ )
public String getComments() {
return comments;
}
@@ -49,6 +53,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return number tasks that may transmit flow files to the target port concurrently
*/
+ @ApiModelProperty(
+ value = "The number of task that may transmit flowfiles to the target port concurrently."
+ )
public Integer getConcurrentlySchedulableTaskCount() {
return concurrentlySchedulableTaskCount;
}
@@ -60,6 +67,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return id of the target port
*/
+ @ApiModelProperty(
+ value = "The id of the target port."
+ )
public String getId() {
return id;
}
@@ -71,6 +81,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return id of the remote process group that this port resides in
*/
+ @ApiModelProperty(
+ value = "The id of the remote process group that the port resides in."
+ )
public String getGroupId() {
return groupId;
}
@@ -82,6 +95,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return name of the target port
*/
+ @ApiModelProperty(
+ value = "The name of the target port."
+ )
public String getName() {
return name;
}
@@ -93,6 +109,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return whether or not this remote group port is configured for transmission
*/
+ @ApiModelProperty(
+ value = "Whether the remote port is configured for transmission."
+ )
public Boolean isTransmitting() {
return transmitting;
}
@@ -104,6 +123,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return whether or not flow file are compressed when sent to this target port
*/
+ @ApiModelProperty(
+ value = "Whether the flowfiles are compressed when sent to the target port."
+ )
public Boolean getUseCompression() {
return useCompression;
}
@@ -115,6 +137,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return whether or not the target port exists
*/
+ @ApiModelProperty(
+ value = "Whether the target port exists."
+ )
public Boolean getExists() {
return exists;
}
@@ -126,6 +151,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return whether or not the target port is running
*/
+ @ApiModelProperty(
+ value = "Whether the target port is running."
+ )
public Boolean isTargetRunning() {
return targetRunning;
}
@@ -137,6 +165,9 @@ public class RemoteProcessGroupPortDTO {
/**
* @return whether or not this port has either an incoming or outgoing connection
*/
+ @ApiModelProperty(
+ value = "Whether the port has either an incoming or outgoing connection."
+ )
public Boolean isConnected() {
return connected;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java
index 4abba4b..cdc834c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Map;
@@ -49,6 +50,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return user-defined name of the reporting task
*/
+ @ApiModelProperty(
+ value = "The name of the reporting task."
+ )
public String getName() {
return name;
}
@@ -60,6 +64,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return user-defined comments for the reporting task
*/
+ @ApiModelProperty(
+ value = "The comments of the reporting task."
+ )
public String getComments() {
return comments;
}
@@ -71,6 +78,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return type of reporting task
*/
+ @ApiModelProperty(
+ value = "The fully qualified type of the reporting task."
+ )
public String getType() {
return type;
}
@@ -84,6 +94,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
*
* @return The scheduling period
*/
+ @ApiModelProperty(
+ value = "The frequency with which to schedule the reporting task. The format of the value willd epend on the valud of the schedulingStrategy."
+ )
public String getSchedulingPeriod() {
return schedulingPeriod;
}
@@ -95,6 +108,10 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return current scheduling state of the reporting task
*/
+ @ApiModelProperty(
+ value = "The state of the reporting task.",
+ allowableValues = "RUNNING, STOPPED, DISABLED"
+ )
public String getState() {
return state;
}
@@ -106,6 +123,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return The scheduling strategy that determines how the {@link #getSchedulingPeriod()} value should be interpreted
*/
+ @ApiModelProperty(
+ value = "The scheduling strategy that determines how the schedulingPeriod value should be interpreted."
+ )
public String getSchedulingStrategy() {
return schedulingStrategy;
}
@@ -115,8 +135,12 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
}
/**
- * @return Where this service is available. Possible values are CLUSTER_MANAGER_ONLY, NODE_ONLY, BOTH
+ * @return Where this service is available. Possible values are NCM, NODE
*/
+ @ApiModelProperty(
+ value = "Where the reporting task is available.",
+ allowableValues = "NCM, NODE"
+ )
public String getAvailability() {
return availability;
}
@@ -128,6 +152,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return reporting task's properties
*/
+ @ApiModelProperty(
+ value = "The properties of the reporting task."
+ )
public Map<String, String> getProperties() {
return properties;
}
@@ -139,6 +166,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return Map of property name to descriptor
*/
+ @ApiModelProperty(
+ value = "The descriptors for the reporting tasks properties."
+ )
public Map<String, PropertyDescriptorDTO> getDescriptors() {
return descriptors;
}
@@ -150,6 +180,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return the URL for this reporting task custom configuration UI if applicable. Null otherwise
*/
+ @ApiModelProperty(
+ value = "The URL for the custom configuration UI for the reporting task."
+ )
public String getCustomUiUrl() {
return customUiUrl;
}
@@ -161,6 +194,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return currently configured annotation data for the reporting task
*/
+ @ApiModelProperty(
+ value = "The anntation data for the repoting task. This is how the custom UI relays configuration to the reporting task."
+ )
public String getAnnotationData() {
return annotationData;
}
@@ -174,6 +210,10 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
*
* @return The validation errors
*/
+ @ApiModelProperty(
+ value = "Gets the validation errors from the reporting task. These validation errors represent the problems with the reporting task that must be resolved before "
+ + "it can be scheduled to run."
+ )
public Collection<String> getValidationErrors() {
return validationErrors;
}
@@ -185,6 +225,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return default scheduling period for the different scheduling strategies
*/
+ @ApiModelProperty(
+ value = "The default scheduling period for the different scheduling strategies."
+ )
public Map<String, String> getDefaultSchedulingPeriod() {
return defaultSchedulingPeriod;
}
@@ -196,6 +239,9 @@ public class ReportingTaskDTO extends NiFiComponentDTO {
/**
* @return number of active threads for this reporting task
*/
+ @ApiModelProperty(
+ value = "The number of active threads for the reporting task."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
index e8f4309..c8ef843 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/RevisionDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -35,6 +36,10 @@ public class RevisionDTO {
*
* @return The client id
*/
+ @ApiModelProperty(
+ value = "A client identifier used to make a request. By including a client identifier, the API can allow multiple requests without needing the current revision. Due to the asynchronous "
+ + "nature of requests/responses this was implemented to allow the client to make numerous requests without having to wait for the previous response to come back"
+ )
public String getClientId() {
return clientId;
}
@@ -48,6 +53,10 @@ public class RevisionDTO {
*
* @return The revision
*/
+ @ApiModelProperty(
+ value = "NiFi employs an optimistic locking strategy where the client must include a revision in their request when performing an update. In a response to a mutable flow request, this "
+ + "field represents the updated base version."
+ )
public Long getVersion() {
return version;
}
@@ -59,6 +68,9 @@ public class RevisionDTO {
/**
* @return The user that last modified the flow
*/
+ @ApiModelProperty(
+ value = "The user that last modified the flow."
+ )
public String getLastModifier() {
return lastModifier;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
index 810b7be..431df17 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SnippetDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.HashSet;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -46,6 +47,9 @@ public class SnippetDTO {
/**
* @return id of this snippet
*/
+ @ApiModelProperty(
+ value = "The id of the snippet."
+ )
public String getId() {
return id;
}
@@ -57,6 +61,9 @@ public class SnippetDTO {
/**
* @return uri of this snippet
*/
+ @ApiModelProperty(
+ value = "The URI of the snippet."
+ )
public String getUri() {
return uri;
}
@@ -68,6 +75,9 @@ public class SnippetDTO {
/**
* @return group id for the components in this snippet
*/
+ @ApiModelProperty(
+ value = "The group id for the components in the snippet."
+ )
public String getParentGroupId() {
return parentGroupId;
}
@@ -79,6 +89,11 @@ public class SnippetDTO {
/**
* @return whether or not this snippet is linked to the underlying data flow
*/
+ @ApiModelProperty(
+ value = "Whether or not the snippet is linked to the underlying data flow. For instance if linked was set to true and the snippet was deleted "
+ + "it would also deleted the components in the snippet. If the snippet was not linked, deleting the snippet would only remove the "
+ + "snippet and leave the component intact."
+ )
public Boolean isLinked() {
return linked;
}
@@ -91,6 +106,10 @@ public class SnippetDTO {
* @return the ids of the connections in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been created its
* contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the connections in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getConnections() {
return connections;
}
@@ -103,6 +122,10 @@ public class SnippetDTO {
* @return the ids of the funnels in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been created its
* contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the funnels in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getFunnels() {
return funnels;
}
@@ -115,6 +138,10 @@ public class SnippetDTO {
* @return the ids of the input port in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been created its
* contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the input ports in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getInputPorts() {
return inputPorts;
}
@@ -127,6 +154,10 @@ public class SnippetDTO {
* @return the ids of the labels in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been created its
* contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the labels in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getLabels() {
return labels;
}
@@ -139,6 +170,10 @@ public class SnippetDTO {
* @return the ids of the output ports in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been created
* its contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the output ports in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getOutputPorts() {
return outputPorts;
}
@@ -151,6 +186,10 @@ public class SnippetDTO {
* @return The ids of the process groups in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been created
* its contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the process groups in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getProcessGroups() {
return processGroups;
}
@@ -163,6 +202,10 @@ public class SnippetDTO {
* @return The ids of the processors in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been created its
* contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the processors in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getProcessors() {
return processors;
}
@@ -175,6 +218,10 @@ public class SnippetDTO {
* @return the ids of the remote process groups in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet has been
* created its contents cannot be modified (these ids are ignored during update requests)
*/
+ @ApiModelProperty(
+ value = "The ids of the remote process groups in this snippet. These ids will be populated within each response. They can be specified when creating a snippet. However, once a snippet "
+ + "has been created its contents cannot be modified (these ids are ignored during update requests)."
+ )
public Set<String> getRemoteProcessGroups() {
return remoteProcessGroups;
}
@@ -186,6 +233,9 @@ public class SnippetDTO {
/**
* @return the contents of the configuration for this snippet
*/
+ @ApiModelProperty(
+ value = "The contents of the configuration for the snippet."
+ )
public FlowSnippetDTO getContents() {
return contents;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
index f39cbaf..d2a9d1a 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/SystemDiagnosticsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -56,6 +57,9 @@ public class SystemDiagnosticsDTO {
/**
* @return number of available processors, if supported
*/
+ @ApiModelProperty(
+ value = "Number of available processors if supported by the underlying system."
+ )
public Integer getAvailableProcessors() {
return availableProcessors;
}
@@ -67,6 +71,9 @@ public class SystemDiagnosticsDTO {
/**
* @return number of daemon threads
*/
+ @ApiModelProperty(
+ value = "Number of daemon threads."
+ )
public Integer getDaemonThreads() {
return daemonThreads;
}
@@ -78,6 +85,9 @@ public class SystemDiagnosticsDTO {
/**
* @return amount of free heap
*/
+ @ApiModelProperty(
+ value = "Amount of free heap."
+ )
public String getFreeHeap() {
return freeHeap;
}
@@ -89,6 +99,9 @@ public class SystemDiagnosticsDTO {
/**
* @return amount of free non-heap
*/
+ @ApiModelProperty(
+ value = "Amount of free non heap."
+ )
public String getFreeNonHeap() {
return freeNonHeap;
}
@@ -100,6 +113,9 @@ public class SystemDiagnosticsDTO {
/**
* @return max size of the heap
*/
+ @ApiModelProperty(
+ value = "Maximum size of heap."
+ )
public String getMaxHeap() {
return maxHeap;
}
@@ -111,6 +127,9 @@ public class SystemDiagnosticsDTO {
/**
* @return max size of the non-heap
*/
+ @ApiModelProperty(
+ value = "Maximum size of non heap."
+ )
public String getMaxNonHeap() {
return maxNonHeap;
}
@@ -122,6 +141,9 @@ public class SystemDiagnosticsDTO {
/**
* @return processor load average, if supported
*/
+ @ApiModelProperty(
+ value = "The processor load average if supported by the underlying system."
+ )
public Double getProcessorLoadAverage() {
return processorLoadAverage;
}
@@ -133,6 +155,9 @@ public class SystemDiagnosticsDTO {
/**
* @return total size of the heap
*/
+ @ApiModelProperty(
+ value = "Total size of heap."
+ )
public String getTotalHeap() {
return totalHeap;
}
@@ -144,6 +169,9 @@ public class SystemDiagnosticsDTO {
/**
* @return total size of non-heap
*/
+ @ApiModelProperty(
+ value = "Total size of non heap."
+ )
public String getTotalNonHeap() {
return totalNonHeap;
}
@@ -155,6 +183,9 @@ public class SystemDiagnosticsDTO {
/**
* @return total number of threads
*/
+ @ApiModelProperty(
+ value = "Total number of threads."
+ )
public Integer getTotalThreads() {
return totalThreads;
}
@@ -166,6 +197,9 @@ public class SystemDiagnosticsDTO {
/**
* @return amount of used heap
*/
+ @ApiModelProperty(
+ value = "Amount of used heap."
+ )
public String getUsedHeap() {
return usedHeap;
}
@@ -177,6 +211,9 @@ public class SystemDiagnosticsDTO {
/**
* @return amount of used non-heap
*/
+ @ApiModelProperty(
+ value = "Amount of use non heap."
+ )
public String getUsedNonHeap() {
return usedNonHeap;
}
@@ -188,6 +225,9 @@ public class SystemDiagnosticsDTO {
/**
* @return heap utilization
*/
+ @ApiModelProperty(
+ value = "Utilization of heap."
+ )
public String getHeapUtilization() {
return heapUtilization;
}
@@ -199,6 +239,9 @@ public class SystemDiagnosticsDTO {
/**
* @return non-heap utilization
*/
+ @ApiModelProperty(
+ value = "Utilization of non heap."
+ )
public String getNonHeapUtilization() {
return nonHeapUtilization;
}
@@ -210,6 +253,9 @@ public class SystemDiagnosticsDTO {
/**
* @return content repository storage usage
*/
+ @ApiModelProperty(
+ value = "The content repository storage usage."
+ )
public Set<StorageUsageDTO> getContentRepositoryStorageUsage() {
return contentRepositoryStorageUsage;
}
@@ -221,6 +267,9 @@ public class SystemDiagnosticsDTO {
/**
* @return flowfile repository storage usage
*/
+ @ApiModelProperty(
+ value = "The flowfile repository storage usage."
+ )
public StorageUsageDTO getFlowFileRepositoryStorageUsage() {
return flowFileRepositoryStorageUsage;
}
@@ -232,6 +281,9 @@ public class SystemDiagnosticsDTO {
/**
* @return Garbage collection details
*/
+ @ApiModelProperty(
+ value = "The garbage collection details."
+ )
public Set<GarbageCollectionDTO> getGarbageCollection() {
return garbageCollection;
}
@@ -244,6 +296,9 @@ public class SystemDiagnosticsDTO {
* @return When these diagnostics were generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "When the diagnostics were generated."
+ )
public Date getStatsLastRefreshed() {
return statsLastRefreshed;
}
@@ -270,6 +325,9 @@ public class SystemDiagnosticsDTO {
/**
* @return identifier for this storage location
*/
+ @ApiModelProperty(
+ value = "The identifier of this storage location. The identifier will correspond to the identifier keyed in the storage configuration."
+ )
public String getIdentifier() {
return identifier;
}
@@ -281,6 +339,9 @@ public class SystemDiagnosticsDTO {
/**
* @return amount of free space
*/
+ @ApiModelProperty(
+ value = "Amount of free space."
+ )
public String getFreeSpace() {
return freeSpace;
}
@@ -292,6 +353,9 @@ public class SystemDiagnosticsDTO {
/**
* @return freeSpace amount of total space
*/
+ @ApiModelProperty(
+ value = "Amount of total space."
+ )
public String getTotalSpace() {
return totalSpace;
}
@@ -303,6 +367,9 @@ public class SystemDiagnosticsDTO {
/**
* @return amount of used space
*/
+ @ApiModelProperty(
+ value = "Amount of used space."
+ )
public String getUsedSpace() {
return usedSpace;
}
@@ -314,6 +381,9 @@ public class SystemDiagnosticsDTO {
/**
* @return utilization of this storage location
*/
+ @ApiModelProperty(
+ value = "Utilization of this storage location."
+ )
public String getUtilization() {
return utilization;
}
@@ -325,6 +395,9 @@ public class SystemDiagnosticsDTO {
/**
* @return number of bytes of free space
*/
+ @ApiModelProperty(
+ value = "The number of bytes of free space."
+ )
public Long getFreeSpaceBytes() {
return freeSpaceBytes;
}
@@ -336,6 +409,9 @@ public class SystemDiagnosticsDTO {
/**
* @return number of bytes of total space
*/
+ @ApiModelProperty(
+ value = "The number of bytes of total space."
+ )
public Long getTotalSpaceBytes() {
return totalSpaceBytes;
}
@@ -347,6 +423,9 @@ public class SystemDiagnosticsDTO {
/**
* @return number of bytes of used space
*/
+ @ApiModelProperty(
+ value = "The number of bytes of used space."
+ )
public Long getUsedSpaceBytes() {
return usedSpaceBytes;
}
@@ -369,6 +448,9 @@ public class SystemDiagnosticsDTO {
/**
* @return name of the garbage collector
*/
+ @ApiModelProperty(
+ value = "The name of the garbage collector."
+ )
public String getName() {
return name;
}
@@ -377,6 +459,9 @@ public class SystemDiagnosticsDTO {
this.name = name;
}
+ @ApiModelProperty(
+ value = "The number of times garbage collection has run."
+ )
public long getCollectionCount() {
return collectionCount;
}
@@ -391,6 +476,9 @@ public class SystemDiagnosticsDTO {
/**
* @return total amount of time spent garbage collecting
*/
+ @ApiModelProperty(
+ value = "The total amount of time spent garbage collecting."
+ )
public String getCollectionTime() {
return collectionTime;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
index 635e3e8..6fa9daf 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/TemplateDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -39,6 +40,9 @@ public class TemplateDTO {
/**
* @return id for this template
*/
+ @ApiModelProperty(
+ value = "The id of the template."
+ )
public String getId() {
return id;
}
@@ -50,6 +54,9 @@ public class TemplateDTO {
/**
* @return uri for this template
*/
+ @ApiModelProperty(
+ value = "The URI for the template."
+ )
public String getUri() {
return uri;
}
@@ -61,6 +68,9 @@ public class TemplateDTO {
/**
* @return name of this template
*/
+ @ApiModelProperty(
+ value = "The name of the template."
+ )
public String getName() {
return name;
}
@@ -72,6 +82,9 @@ public class TemplateDTO {
/**
* @return description of this template
*/
+ @ApiModelProperty(
+ value = "The description of the template."
+ )
public String getDescription() {
return description;
}
@@ -84,6 +97,9 @@ public class TemplateDTO {
* @return timestamp when this template was created
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when this template was created."
+ )
public Date getTimestamp() {
return timestamp;
}
@@ -95,6 +111,9 @@ public class TemplateDTO {
/**
* @return snippet in this template
*/
+ @ApiModelProperty(
+ value = "The contents of the template."
+ )
public FlowSnippetDTO getSnippet() {
return snippet;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
index 2c56422..3344306 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -43,6 +44,9 @@ public class UserDTO {
/**
* @return user id
*/
+ @ApiModelProperty(
+ value = "The id of the user."
+ )
public String getId() {
return id;
}
@@ -54,6 +58,9 @@ public class UserDTO {
/**
* @return users authorities
*/
+ @ApiModelProperty(
+ value = "The users authorities."
+ )
public Set<String> getAuthorities() {
return authorities;
}
@@ -66,6 +73,9 @@ public class UserDTO {
* @return creation time for this users account
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when the user was created."
+ )
public Date getCreation() {
return creation;
}
@@ -77,6 +87,9 @@ public class UserDTO {
/**
* @return users DN
*/
+ @ApiModelProperty(
+ value = "The dn of the user."
+ )
public String getDn() {
return dn;
}
@@ -88,6 +101,9 @@ public class UserDTO {
/**
* @return users name. If the name could not be extracted from the DN, this value will be the entire DN
*/
+ @ApiModelProperty(
+ value = "The username. If it could not be extracted from the DN, this value will be the entire DN."
+ )
public String getUserName() {
return userName;
}
@@ -99,6 +115,9 @@ public class UserDTO {
/**
* @return user group
*/
+ @ApiModelProperty(
+ value = "The group this user belongs to."
+ )
public String getUserGroup() {
return userGroup;
}
@@ -110,6 +129,9 @@ public class UserDTO {
/**
* @return users account justification
*/
+ @ApiModelProperty(
+ value = "The justification for the user account."
+ )
public String getJustification() {
return justification;
}
@@ -122,6 +144,9 @@ public class UserDTO {
* @return time that the user last accessed the system
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp the user last accessed the system."
+ )
public Date getLastAccessed() {
return lastAccessed;
}
@@ -134,6 +159,9 @@ public class UserDTO {
* @return time that the users credentials were last verified
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp the user authorities were verified."
+ )
public Date getLastVerified() {
return lastVerified;
}
@@ -145,6 +173,9 @@ public class UserDTO {
/**
* @return status of the users account
*/
+ @ApiModelProperty(
+ value = "The user status."
+ )
public String getStatus() {
return status;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
index 6c4d224..8f6a3a1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/UserGroupDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Set;
import javax.xml.bind.annotation.XmlType;
@@ -33,6 +34,9 @@ public class UserGroupDTO {
/**
* @return user group
*/
+ @ApiModelProperty(
+ value = "The user group."
+ )
public String getGroup() {
return group;
}
@@ -44,6 +48,9 @@ public class UserGroupDTO {
/**
* @return users in this group
*/
+ @ApiModelProperty(
+ value = "The users that belong to the group."
+ )
public Set<String> getUserIds() {
return userIds;
}
@@ -55,6 +62,9 @@ public class UserGroupDTO {
/**
* @return status of the users account
*/
+ @ApiModelProperty(
+ value = "The status of the users accounts."
+ )
public String getStatus() {
return status;
}
@@ -66,6 +76,9 @@ public class UserGroupDTO {
/**
* @return users authorities
*/
+ @ApiModelProperty(
+ value = "The authorities of the users."
+ )
public Set<String> getAuthorities() {
return authorities;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
index 357dd0f..d4dea38 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -45,6 +46,9 @@ public class ActionDTO {
/**
* @return action id
*/
+ @ApiModelProperty(
+ value = "The action id."
+ )
public Integer getId() {
return id;
}
@@ -56,6 +60,9 @@ public class ActionDTO {
/**
* @return user dn who perform this action
*/
+ @ApiModelProperty(
+ value = "The dn of the user that performed the action."
+ )
public String getUserDn() {
return userDn;
}
@@ -67,6 +74,9 @@ public class ActionDTO {
/**
* @return user name who perform this action
*/
+ @ApiModelProperty(
+ value = "The name of the user that performed the action."
+ )
public String getUserName() {
return userName;
}
@@ -79,6 +89,9 @@ public class ActionDTO {
* @return action's timestamp
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp of the action."
+ )
public Date getTimestamp() {
return timestamp;
}
@@ -90,6 +103,9 @@ public class ActionDTO {
/**
* @return id of the source component of this action
*/
+ @ApiModelProperty(
+ value = "The id of the source component."
+ )
public String getSourceId() {
return sourceId;
}
@@ -101,6 +117,9 @@ public class ActionDTO {
/**
* @return name of the source component of this action
*/
+ @ApiModelProperty(
+ value = "The name of the source component."
+ )
public String getSourceName() {
return sourceName;
}
@@ -112,6 +131,9 @@ public class ActionDTO {
/**
* @return type of the source component of this action
*/
+ @ApiModelProperty(
+ value = "The type of the source component."
+ )
public String getSourceType() {
return sourceType;
}
@@ -123,6 +145,9 @@ public class ActionDTO {
/**
* @return component details (if any) for this action
*/
+ @ApiModelProperty(
+ value = "The details of the source component."
+ )
public ComponentDetailsDTO getComponentDetails() {
return componentDetails;
}
@@ -134,6 +159,9 @@ public class ActionDTO {
/**
* @return operation being performed in this action
*/
+ @ApiModelProperty(
+ value = "The operation that was performed."
+ )
public String getOperation() {
return operation;
}
@@ -145,6 +173,9 @@ public class ActionDTO {
/**
* @return action details (if any) for this action
*/
+ @ApiModelProperty(
+ value = "The details of the action."
+ )
public ActionDetailsDTO getActionDetails() {
return actionDetails;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
index 36a5e47..597ef0b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -35,6 +36,9 @@ public class HistoryDTO {
/**
* @return total number of actions
*/
+ @ApiModelProperty(
+ value = "The number of number of actions that matched the search criteria.."
+ )
public Integer getTotal() {
return total;
}
@@ -47,6 +51,9 @@ public class HistoryDTO {
* @return timestamp when these records were returned
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when the report was generated."
+ )
public Date getLastRefreshed() {
return lastRefreshed;
}
@@ -58,6 +65,9 @@ public class HistoryDTO {
/**
* @return actions for this range
*/
+ @ApiModelProperty(
+ value = "The actions."
+ )
public Collection<ActionDTO> getActions() {
return actions;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
index 48a1321..7d4d21d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/HistoryQueryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -39,6 +40,9 @@ public class HistoryQueryDTO {
/**
* @return user name
*/
+ @ApiModelProperty(
+ value = "The name of the source component."
+ )
public String getUserName() {
return userName;
}
@@ -50,6 +54,9 @@ public class HistoryQueryDTO {
/**
* @return source component id
*/
+ @ApiModelProperty(
+ value = "The id of the source component."
+ )
public String getSourceId() {
return sourceId;
}
@@ -62,6 +69,9 @@ public class HistoryQueryDTO {
* @return start date
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The start date of actions to return."
+ )
public Date getStartDate() {
return startDate;
}
@@ -74,6 +84,9 @@ public class HistoryQueryDTO {
* @return end date
*/
@XmlJavaTypeAdapter(DateTimeAdapter.class)
+ @ApiModelProperty(
+ value = "The end date of actions to return."
+ )
public Date getEndDate() {
return endDate;
}
@@ -85,6 +98,9 @@ public class HistoryQueryDTO {
/**
* @return offset
*/
+ @ApiModelProperty(
+ value = "The offset into the result set."
+ )
public Integer getOffset() {
return offset;
}
@@ -96,6 +112,9 @@ public class HistoryQueryDTO {
/**
* @return desired row count
*/
+ @ApiModelProperty(
+ value = "The number of actions to return."
+ )
public Integer getCount() {
return count;
}
@@ -107,6 +126,9 @@ public class HistoryQueryDTO {
/**
* @return desired sort column
*/
+ @ApiModelProperty(
+ value = "The field to sort on."
+ )
public String getSortColumn() {
return sortColumn;
}
@@ -118,6 +140,9 @@ public class HistoryQueryDTO {
/**
* @return desired sort order
*/
+ @ApiModelProperty(
+ value = "The sort order."
+ )
public String getSortOrder() {
return sortOrder;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java
index 90eb5f0..81f87c1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/component/details/ExtensionDetailsDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.action.component.details;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -29,6 +30,9 @@ public class ExtensionDetailsDTO extends ComponentDetailsDTO {
/**
* @return extension type
*/
+ @ApiModelProperty(
+ value = "The fully qualified type of extension."
+ )
public String getType() {
return type;
}
[27/54] [abbrv] incubator-nifi git commit: NIFI-587 moved checkstyle
into profile with rat plugin. They were too unstable
Posted by ma...@apache.org.
NIFI-587 moved checkstyle into profile with rat plugin. They were too unstable
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/41b21af5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/41b21af5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/41b21af5
Branch: refs/heads/master
Commit: 41b21af5769211b9a57e5bef47fe40c6d34839b1
Parents: 37e5548
Author: joewitt <jo...@apache.org>
Authored: Tue May 5 00:59:28 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Tue May 5 00:59:28 2015 -0400
----------------------------------------------------------------------
nifi-parent/pom.xml | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/41b21af5/nifi-parent/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml
index 6fcf364..fb2f827 100644
--- a/nifi-parent/pom.xml
+++ b/nifi-parent/pom.xml
@@ -259,14 +259,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>check-style</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<checkstyleRules>
<module name="Checker">
@@ -377,9 +369,15 @@
</build>
<profiles>
<profile>
- <!-- Automatically check for licenses. Too slow to always run.
- Activate with -P check-licenses -->
- <id>check-licenses</id>
+ <!--
+ Checks style and licensing requirements. This is a good idea to
+ run for contributions and for the release process. While it
+ would be nice to run always these plugins can considerably slow
+ the build and have proven to create unstable builds in our
+ multi-module project and when building using multiple threads.
+ The stability issues seen with Checkstyle in multi-module builds
+ include false-positives and false negatives.-->
+ <id>contrib-check</id>
<build>
<plugins>
<plugin>
@@ -394,6 +392,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>check-style</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
[36/54] [abbrv] incubator-nifi git commit: NIFI-592: - Fixing
scrollbar issue with pages loaded in an iframe. - Updating build process to
tweak the rest api documentation layout that is deployed to the website.
Posted by ma...@apache.org.
NIFI-592:
- Fixing scrollbar issue with pages loaded in an iframe.
- Updating build process to tweak the rest api documentation layout that is deployed to the website.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f0a5c11f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f0a5c11f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f0a5c11f
Branch: refs/heads/master
Commit: f0a5c11f1bfa840ebc218d148702c9a716461334
Parents: 81e40d4
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed May 6 10:32:28 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed May 6 10:32:28 2015 -0400
----------------------------------------------------------------------
nifi-site/Gruntfile.js | 18 +++++++++++++++++-
nifi-site/src/scss/app.scss | 2 ++
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f0a5c11f/nifi-site/Gruntfile.js
----------------------------------------------------------------------
diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js
index baa4c21..2a3a5ba 100644
--- a/nifi-site/Gruntfile.js
+++ b/nifi-site/Gruntfile.js
@@ -145,6 +145,22 @@ module.exports = function (grunt) {
"</script>\n" +
"</head>"
}]
+ },
+ moveTearDrop: {
+ src: ['dist/docs/rest-api/index.html'],
+ overwrite: true,
+ replacements: [{
+ from: /<img class="logo" src="images\/bgNifiLogo.png" alt="NiFi Logo"\/>/g,
+ to: '<img class="logo" src="images/bgNifiLogo.png" alt="NiFi Logo" style="float: right;"/>'
+ }]
+ },
+ removeVersion: {
+ src: ['dist/docs/rest-api/index.html'],
+ overwrite: true,
+ replacements: [{
+ from: /<div class="sub-title">.*<\/div>/g,
+ to: '<div class="sub-title">NiFi Rest Api</div>'
+ }]
}
},
watch: {
@@ -184,7 +200,7 @@ module.exports = function (grunt) {
grunt.registerTask('img', ['newer:copy']);
grunt.registerTask('css', ['clean:css', 'compass']);
grunt.registerTask('js', ['clean:js', 'concat']);
- grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics']);
+ grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics', 'replace:moveTearDrop', 'replace:removeVersion']);
grunt.registerTask('default', ['clean', 'assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']);
grunt.registerTask('dev', ['default', 'watch']);
};
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f0a5c11f/nifi-site/src/scss/app.scss
----------------------------------------------------------------------
diff --git a/nifi-site/src/scss/app.scss b/nifi-site/src/scss/app.scss
index ddd0c87..70de9e7 100644
--- a/nifi-site/src/scss/app.scss
+++ b/nifi-site/src/scss/app.scss
@@ -187,6 +187,8 @@ div.external-guide {
div.external-guide iframe {
width: 100%;
height: 100%;
+ border-width: 0;
+ display: block;
}
/*
[19/54] [abbrv] incubator-nifi git commit: NIFI-573 fix NPE in
nifi.sh and clean up open streams
Posted by ma...@apache.org.
NIFI-573 fix NPE in nifi.sh and clean up open streams
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/22ded807
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/22ded807
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/22ded807
Branch: refs/heads/master
Commit: 22ded807be8a81f09b618af4c79a9b2d8ee7496f
Parents: 018473b
Author: Mark Latimer <ma...@gmail.com>
Authored: Sat May 2 12:47:29 2015 +0100
Committer: Mark Payne <ma...@hotmail.com>
Committed: Sun May 3 17:13:30 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/22ded807/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index d3796b5..bb83e3d 100644
--- a/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -276,6 +276,8 @@ public class RunNiFi {
final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
final String response = reader.readLine();
logger.log(Level.FINE, "PING response: {0}", response);
+ out.close();
+ reader.close();
return PING_CMD.equals(response);
} catch (final IOException ioe) {
@@ -425,6 +427,7 @@ public class RunNiFi {
final Integer port = getCurrentPort();
if (port == null) {
System.out.println("Apache NiFi is not currently running");
+ return;
}
final Properties nifiProps = loadProperties();
@@ -442,6 +445,7 @@ public class RunNiFi {
final OutputStream out = socket.getOutputStream();
out.write((DUMP_CMD + " " + secretKey + "\n").getBytes(StandardCharsets.UTF_8));
out.flush();
+ out.close();
final InputStream in = socket.getInputStream();
final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
@@ -449,6 +453,7 @@ public class RunNiFi {
while ((line = reader.readLine()) != null) {
sb.append(line).append("\n");
}
+ reader.close();
}
final String dump = sb.toString();
@@ -483,10 +488,12 @@ public class RunNiFi {
final OutputStream out = socket.getOutputStream();
out.write((SHUTDOWN_CMD + " " + secretKey + "\n").getBytes(StandardCharsets.UTF_8));
out.flush();
+ out.close();
final InputStream in = socket.getInputStream();
final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
final String response = reader.readLine();
+ reader.close();
logger.log(Level.FINE, "Received response to SHUTDOWN command: {0}", response);
[46/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare for next
development iteration
Posted by ma...@apache.org.
NIFI-429: prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a25fcb7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a25fcb7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a25fcb7a
Branch: refs/heads/master
Commit: a25fcb7a02cfcd34658ddd0e02979abfb85e7e6b
Parents: 37732bd
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon May 11 13:58:46 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 13:58:46 2015 -0400
----------------------------------------------------------------------
nifi-parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a25fcb7a/nifi-parent/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml
index 9c26d15..9ccb6ec 100644
--- a/nifi-parent/pom.xml
+++ b/nifi-parent/pom.xml
@@ -23,7 +23,7 @@
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parent</artifactId>
- <version>1.0.0-incubating</version>
+ <version>1.0.1-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>The nifi-parent enables each apache nifi project to ensure consistent approaches and DRY</description>
<url>http://nifi.incubator.apache.org</url>
@@ -60,7 +60,7 @@
<connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url>
- <tag>nifi-parent-1.0.0-incubating-rc13</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
<system>JIRA</system>
[31/54] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cf3dbef2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cf3dbef2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cf3dbef2
Branch: refs/heads/master
Commit: cf3dbef2a8917191464708060d49449cb2e23160
Parents: c90bb8a 3472bf3
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue May 5 23:04:18 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue May 5 23:04:18 2015 -0400
----------------------------------------------------------------------
nifi-nar-maven-plugin/pom.xml | 2 +-
nifi-parent/pom.xml | 32 +++++++++++++++++++++-----------
2 files changed, 22 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[44/54] [abbrv] incubator-nifi git commit: NIFI-603 Providing a
consistent "bad host" to use throughout the FileBasedClusterNodeFirewall in
skipping troublesome tests where DNS may incorrectly return an address for a
nonexistent host
Posted by ma...@apache.org.
NIFI-603 Providing a consistent "bad host" to use throughout the FileBasedClusterNodeFirewall in skipping troublesome tests where DNS may incorrectly return an address for a nonexistent host
Signed-off-by: Mark Payne <ma...@hotmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c4d1666a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c4d1666a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c4d1666a
Branch: refs/heads/master
Commit: c4d1666a26c86a89ced186caf638ecf6c4437a38
Parents: 1dce27f
Author: Aldrin Piri <al...@apache.org>
Authored: Sat May 9 11:07:50 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon May 11 13:37:30 2015 -0400
----------------------------------------------------------------------
.../impl/FileBasedClusterNodeFirewallTest.java | 28 +++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c4d1666a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
index 5259f4f..b5f76fb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/firewall/impl/FileBasedClusterNodeFirewallTest.java
@@ -44,6 +44,8 @@ public class FileBasedClusterNodeFirewallTest {
@Rule
public final TemporaryFolder temp = new TemporaryFolder();
+ private static final String NONEXISTENT_HOSTNAME = "abc";
+
private static boolean badHostsDoNotResolve = false;
/**
@@ -55,7 +57,7 @@ public class FileBasedClusterNodeFirewallTest {
public static void ensureBadHostsDoNotWork() {
final InetAddress ip;
try {
- ip = InetAddress.getByName("I typed a search term and my browser expected a host.");
+ ip = InetAddress.getByName(NONEXISTENT_HOSTNAME);
} catch (final UnknownHostException uhe) {
badHostsDoNotResolve = true;
}
@@ -80,13 +82,13 @@ public class FileBasedClusterNodeFirewallTest {
public void ensureBadDataWasIgnored() {
assumeTrue(badHostsDoNotResolve);
assertFalse("firewall treated our malformed data as a host. If " +
- "`host \"bad data should be skipped\"` works locally, this test should have been " +
- "skipped.",
- ipsFirewall.isPermissible("bad data should be skipped"));
+ "`host \"bad data should be skipped\"` works locally, this test should have been " +
+ "skipped.",
+ ipsFirewall.isPermissible("bad data should be skipped"));
assertFalse("firewall treated our malformed data as a host. If " +
- "`host \"more bad data\"` works locally, this test should have been " +
- "skipped.",
- ipsFirewall.isPermissible("more bad data"));
+ "`host \"more bad data\"` works locally, this test should have been " +
+ "skipped.",
+ ipsFirewall.isPermissible("more bad data"));
}
@Test
@@ -112,9 +114,9 @@ public class FileBasedClusterNodeFirewallTest {
@Test
public void testIsPermissibleWithMalformedData() {
assumeTrue(badHostsDoNotResolve);
- assertFalse("firewall allowed host 'abc' rather than rejecting as malformed. If `host abc` "
- + "works locally, this test should have been skipped.",
- ipsFirewall.isPermissible("abc"));
+ assertFalse("firewall allowed host '" + NONEXISTENT_HOSTNAME + "' rather than rejecting as malformed. If `host " + NONEXISTENT_HOSTNAME + "` "
+ + "works locally, this test should have been skipped.",
+ ipsFirewall.isPermissible(NONEXISTENT_HOSTNAME));
}
@Test
@@ -125,9 +127,9 @@ public class FileBasedClusterNodeFirewallTest {
@Test
public void testIsPermissibleWithEmptyConfigWithMalformedData() {
assumeTrue(badHostsDoNotResolve);
- assertTrue("firewall did not allow malformed host 'abc' under permissive configs. If " +
- "`host abc` works locally, this test should have been skipped.",
- acceptAllFirewall.isPermissible("abc"));
+ assertTrue("firewall did not allow malformed host '" + NONEXISTENT_HOSTNAME + "' under permissive configs. If " +
+ "`host " + NONEXISTENT_HOSTNAME + "` works locally, this test should have been skipped.",
+ acceptAllFirewall.isPermissible(NONEXISTENT_HOSTNAME));
}
}
[22/54] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/684ed8e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/684ed8e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/684ed8e1
Branch: refs/heads/master
Commit: 684ed8e1f5c3b3b2d440990e88e02b3d60a24fbd
Parents: 40438f1 22ded80
Author: Matt Gilman <ma...@gmail.com>
Authored: Sun May 3 19:51:36 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sun May 3 19:51:36 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/nifi/bootstrap/RunNiFi.java | 7 +++++++
.../repository/StandardProcessSession.java | 16 ++++++++--------
.../provenance/PersistentProvenanceRepository.java | 3 ++-
3 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[30/54] [abbrv] incubator-nifi git commit: NIFI-592: - Updating
screen shot to not cut off the right most groups.
Posted by ma...@apache.org.
NIFI-592:
- Updating screen shot to not cut off the right most groups.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c90bb8a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c90bb8a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c90bb8a6
Branch: refs/heads/master
Commit: c90bb8a60064cf8f3abfe702118997fc70547413
Parents: f3e76fe
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue May 5 16:23:58 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue May 5 16:23:58 2015 -0400
----------------------------------------------------------------------
nifi-site/src/images/flow.png | Bin 920561 -> 947350 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c90bb8a6/nifi-site/src/images/flow.png
----------------------------------------------------------------------
diff --git a/nifi-site/src/images/flow.png b/nifi-site/src/images/flow.png
index c9e571a..0308d6b 100644
Binary files a/nifi-site/src/images/flow.png and b/nifi-site/src/images/flow.png differ
[07/54] [abbrv] incubator-nifi git commit: NIFI-292: Merging NIFI-292
into develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
index bd2eca6..7afc7bc 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ControllerStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.BulletinDTO;
@@ -45,6 +46,9 @@ public class ControllerStatusDTO {
*
* @return The active thread count
*/
+ @ApiModelProperty(
+ value = "The number of active threads in the NiFi."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
@@ -56,6 +60,9 @@ public class ControllerStatusDTO {
/**
* @return queue for the controller
*/
+ @ApiModelProperty(
+ value = "The number of flowfilew queued in the NiFi."
+ )
public String getQueued() {
return queued;
}
@@ -67,6 +74,9 @@ public class ControllerStatusDTO {
/**
* @return Used in clustering, will report the number of nodes connected vs the number of nodes in the cluster
*/
+ @ApiModelProperty(
+ value = "When clustered, reports the number of nodes connected vs the number of nodes in the cluster."
+ )
public String getConnectedNodes() {
return connectedNodes;
}
@@ -78,6 +88,9 @@ public class ControllerStatusDTO {
/**
* @return System bulletins to be reported to the user
*/
+ @ApiModelProperty(
+ value = "System level bulletins to be reported to the user."
+ )
public List<BulletinDTO> getBulletins() {
return bulletins;
}
@@ -89,6 +102,9 @@ public class ControllerStatusDTO {
/**
* @return whether or not there are pending user requests
*/
+ @ApiModelProperty(
+ value = "Whether there are any pending user account requests."
+ )
public Boolean getHasPendingAccounts() {
return hasPendingAccounts;
}
@@ -100,6 +116,9 @@ public class ControllerStatusDTO {
/**
* @return number of running components in this controller
*/
+ @ApiModelProperty(
+ value = "The number of running components in the NiFi."
+ )
public Integer getRunningCount() {
return runningCount;
}
@@ -111,6 +130,9 @@ public class ControllerStatusDTO {
/**
* @return number of stopped components in this controller
*/
+ @ApiModelProperty(
+ value = "The number of stopped components in the NiFi."
+ )
public Integer getStoppedCount() {
return stoppedCount;
}
@@ -122,6 +144,9 @@ public class ControllerStatusDTO {
/**
* @return number of invalid components in this controller
*/
+ @ApiModelProperty(
+ value = "The number of invalid components in the NiFi."
+ )
public Integer getInvalidCount() {
return invalidCount;
}
@@ -133,6 +158,9 @@ public class ControllerStatusDTO {
/**
* @return number of disabled components in this controller
*/
+ @ApiModelProperty(
+ value = "The number of disabled components in the NiFi."
+ )
public Integer getDisabledCount() {
return disabledCount;
}
@@ -144,6 +172,9 @@ public class ControllerStatusDTO {
/**
* @return number of active remote ports in this controller
*/
+ @ApiModelProperty(
+ value = "The number of active remote ports in the NiFi."
+ )
public Integer getActiveRemotePortCount() {
return activeRemotePortCount;
}
@@ -155,6 +186,9 @@ public class ControllerStatusDTO {
/**
* @return number of inactive remote ports in this controller
*/
+ @ApiModelProperty(
+ value = "The number of inactive remote ports in the NiFi."
+ )
public Integer getInactiveRemotePortCount() {
return inactiveRemotePortCount;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java
index 39fb5ce..bcc4045 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeConnectionStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.NodeDTO;
@@ -31,6 +32,9 @@ public class NodeConnectionStatusDTO {
/**
* @return the node
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -42,6 +46,9 @@ public class NodeConnectionStatusDTO {
/**
* @return connection's status
*/
+ @ApiModelProperty(
+ value = "The connection status from the node."
+ )
public ConnectionStatusDTO getConnectionStatus() {
return connectionStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java
index 91a6d01..3b37e9d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodePortStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.NodeDTO;
@@ -31,6 +32,9 @@ public class NodePortStatusDTO {
/**
* @return the node
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -42,6 +46,9 @@ public class NodePortStatusDTO {
/**
* @return port status
*/
+ @ApiModelProperty(
+ value = "The port status from the node."
+ )
public PortStatusDTO getPortStatus() {
return portStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusDTO.java
index 5f965b2..96c59fa 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessGroupStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.NodeDTO;
@@ -33,6 +34,9 @@ public class NodeProcessGroupStatusDTO {
*
* @return The node DTO
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -46,6 +50,9 @@ public class NodeProcessGroupStatusDTO {
*
* @return The process group status
*/
+ @ApiModelProperty(
+ value = "The process group status from the node."
+ )
public ProcessGroupStatusDTO getProcessGroupStatus() {
return processGroupStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java
index 86d13d5..8c8f604 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeProcessorStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.NodeDTO;
@@ -31,6 +32,9 @@ public class NodeProcessorStatusDTO {
/**
* @return the node
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -42,6 +46,9 @@ public class NodeProcessorStatusDTO {
/**
* @return processor's status
*/
+ @ApiModelProperty(
+ value = "The processor status from the node."
+ )
public ProcessorStatusDTO getProcessorStatus() {
return processorStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java
index 12a0ca0..512b4c2 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeRemoteProcessGroupStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.NodeDTO;
@@ -31,6 +32,9 @@ public class NodeRemoteProcessGroupStatusDTO {
/**
* @return the node
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -42,6 +46,9 @@ public class NodeRemoteProcessGroupStatusDTO {
/**
* @return remote process group's status
*/
+ @ApiModelProperty(
+ value = "The remote process group status from the node."
+ )
public RemoteProcessGroupStatusDTO getRemoteProcessGroupStatus() {
return remoteProcessGroupStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java
index b770015..3f07f3d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.NodeDTO;
@@ -31,6 +32,9 @@ public class NodeStatusDTO {
/**
* @return the node
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -42,6 +46,9 @@ public class NodeStatusDTO {
/**
* @return the controller status
*/
+ @ApiModelProperty(
+ value = "The controller status for each node."
+ )
public ProcessGroupStatusDTO getControllerStatus() {
return controllerStatus;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java
index 9a7cb16..5cf9f41 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/NodeStatusHistoryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.NodeDTO;
@@ -31,6 +32,9 @@ public class NodeStatusHistoryDTO {
/**
* @return the node
*/
+ @ApiModelProperty(
+ value = "The node."
+ )
public NodeDTO getNode() {
return node;
}
@@ -42,6 +46,9 @@ public class NodeStatusHistoryDTO {
/**
* @return processor status history
*/
+ @ApiModelProperty(
+ value = "The processor status for each node."
+ )
public StatusHistoryDTO getStatusHistory() {
return statusHistory;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java
index e4cbd34..c1d95d0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/PortStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -36,6 +37,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return whether this port has incoming or outgoing connections to a remote NiFi
*/
+ @ApiModelProperty(
+ value = "Whether the port has incoming or outgoing connections to a remote NiFi."
+ )
public Boolean isTransmitting() {
return transmitting;
}
@@ -47,6 +51,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return the active thread count for this port
*/
+ @ApiModelProperty(
+ value = "The active thread count for the port."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
@@ -58,6 +65,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return id of this port
*/
+ @ApiModelProperty(
+ value = "The id of the port."
+ )
public String getId() {
return id;
}
@@ -69,6 +79,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return id of the group this port resides in
*/
+ @ApiModelProperty(
+ value = "The id of the parent process group of the port."
+ )
public String getGroupId() {
return groupId;
}
@@ -80,6 +93,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return name of this port
*/
+ @ApiModelProperty(
+ value = "The name of the port."
+ )
public String getName() {
return name;
}
@@ -91,6 +107,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return run status of this port
*/
+ @ApiModelProperty(
+ value = "The run status of the port."
+ )
public String getRunStatus() {
return runStatus;
}
@@ -102,6 +121,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return The total count and size of flow files that have been accepted in the last five minutes
*/
+ @ApiModelProperty(
+ value = "The count/size of flowfiles that have been accepted in the last 5 minutes."
+ )
public String getInput() {
return input;
}
@@ -113,6 +135,9 @@ public class PortStatusDTO extends StatusDTO {
/**
* @return The total count and size of flow files that have been processed in the last five minutes
*/
+ @ApiModelProperty(
+ value = "The count/size of flowfiles that have been processed in the last 5 minutes."
+ )
public String getOutput() {
return output;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java
index 6aa445a..3ebae8f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessGroupStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Collection;
import java.util.Date;
import javax.xml.bind.annotation.XmlType;
@@ -55,6 +56,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The id for the process group
*/
+ @ApiModelProperty(
+ value = "The id of the process group."
+ )
public String getId() {
return id;
}
@@ -66,6 +70,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
/**
* @return name of this process group
*/
+ @ApiModelProperty(
+ value = "The name of this process group."
+ )
public String getName() {
return name;
}
@@ -77,6 +84,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
/**
* @return active thread count for this process group
*/
+ @ApiModelProperty(
+ value = "The active thread count for this process group."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
@@ -90,6 +100,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The status of all connections
*/
+ @ApiModelProperty(
+ value = "The status of all conenctions in the process group."
+ )
public Collection<ConnectionStatusDTO> getConnectionStatus() {
return connectionStatus;
}
@@ -103,6 +116,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The status of all process groups
*/
+ @ApiModelProperty(
+ value = "The status of all process groups in the process group."
+ )
public Collection<ProcessGroupStatusDTO> getProcessGroupStatus() {
return processGroupStatus;
}
@@ -116,6 +132,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The status of all remote process groups
*/
+ @ApiModelProperty(
+ value = "The status of all remote process groups in the process group.."
+ )
public Collection<RemoteProcessGroupStatusDTO> getRemoteProcessGroupStatus() {
return remoteProcessGroupStatus;
}
@@ -129,6 +148,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The status of all processors
*/
+ @ApiModelProperty(
+ value = "The status of all processors in the process group."
+ )
public Collection<ProcessorStatusDTO> getProcessorStatus() {
return processorStatus;
}
@@ -142,6 +164,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The status of all input ports
*/
+ @ApiModelProperty(
+ value = "The status of all input ports in the process group."
+ )
public Collection<PortStatusDTO> getInputPortStatus() {
return inputPortStatus;
}
@@ -155,6 +180,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The status of all output ports
*/
+ @ApiModelProperty(
+ value = "The status of all output ports in the process group."
+ )
public Collection<PortStatusDTO> getOutputPortStatus() {
return outputPortStatus;
}
@@ -168,6 +196,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The output stats
*/
+ @ApiModelProperty(
+ value = "The output count/size for the process group in the last 5 minutes."
+ )
public String getOutput() {
return output;
}
@@ -181,6 +212,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The transferred status for this process group
*/
+ @ApiModelProperty(
+ value = "The count/size transferred to/frome queues in the process group in the last 5 minutes."
+ )
public String getTransferred() {
return transferred;
}
@@ -194,6 +228,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The received stats for this process group
*/
+ @ApiModelProperty(
+ value = "The count/size sent to the process group in the last 5 minutes."
+ )
public String getReceived() {
return received;
}
@@ -207,6 +244,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The sent stats for this process group
*/
+ @ApiModelProperty(
+ value = "The count/size sent from this process group in the last 5 minutes."
+ )
public String getSent() {
return sent;
}
@@ -220,6 +260,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The queued count for this process group
*/
+ @ApiModelProperty(
+ value = "The count that is queued for the process group."
+ )
public String getQueuedCount() {
return queuedCount;
}
@@ -233,6 +276,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The queued size for this process group
*/
+ @ApiModelProperty(
+ value = "The size that is queued for the process group."
+ )
public String getQueuedSize() {
return queuedSize;
}
@@ -246,6 +292,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The queued stats
*/
+ @ApiModelProperty(
+ value = "The count/size that is queued in the the process group."
+ )
public String getQueued() {
return queued;
}
@@ -259,6 +308,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The read stats
*/
+ @ApiModelProperty(
+ value = "The number of bytes read in the last 5 minutes."
+ )
public String getRead() {
return read;
}
@@ -272,6 +324,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The written stats
*/
+ @ApiModelProperty(
+ value = "The number of bytes written in the last 5 minutes."
+ )
public String getWritten() {
return written;
}
@@ -285,6 +340,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
*
* @return The input stats
*/
+ @ApiModelProperty(
+ value = "The input count/size for the process group in the last 5 minutes."
+ )
public String getInput() {
return input;
}
@@ -299,6 +357,9 @@ public class ProcessGroupStatusDTO extends StatusDTO {
* @return The the status was calculated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The time the status for the process group was last refreshed."
+ )
public Date getStatsLastRefreshed() {
return statsLastRefreshed;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
index 21c3d44..1899418 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/ProcessorStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -44,6 +45,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return The processor id
*/
+ @ApiModelProperty(
+ value = "The id of the processor."
+ )
public String getId() {
return id;
}
@@ -55,6 +59,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return The processor name
*/
+ @ApiModelProperty(
+ value = "The name of the prcessor."
+ )
public String getName() {
return name;
}
@@ -66,6 +73,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return The processor type
*/
+ @ApiModelProperty(
+ value = "The type of the processor."
+ )
public String getType() {
return type;
}
@@ -77,6 +87,10 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return run status of this processor
*/
+ @ApiModelProperty(
+ value = "The state of the processor.",
+ allowableValues = "RUNNING, STOPPED, DISABLED, INVALID"
+ )
public String getRunStatus() {
return runStatus;
}
@@ -88,6 +102,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return The total count and size of flow files that have been accepted in the last five minutes
*/
+ @ApiModelProperty(
+ value = "The count/size of flowfiles that have been accepted in the last 5 minutes."
+ )
public String getInput() {
return input;
}
@@ -99,6 +116,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return number of bytes read
*/
+ @ApiModelProperty(
+ value = "The number of bytes read in the last 5 minutes."
+ )
public String getRead() {
return read;
}
@@ -110,6 +130,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return number of bytes written
*/
+ @ApiModelProperty(
+ value = "The number of bytes written in the last 5 minutes."
+ )
public String getWritten() {
return written;
}
@@ -121,6 +144,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return the ID of the Process Group to which this processor belongs.
*/
+ @ApiModelProperty(
+ value = "The id of the parent process group to which the processor belongs."
+ )
public String getGroupId() {
return groupId;
}
@@ -132,6 +158,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return The total count and size of flow files that have been processed in the last five minutes
*/
+ @ApiModelProperty(
+ value = "The count/size of flowfiles that have been processed in the last 5 minutes."
+ )
public String getOutput() {
return output;
}
@@ -143,6 +172,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return number of threads currently running for this Processor
*/
+ @ApiModelProperty(
+ value = "The number of threads currently executing in the processor."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
@@ -154,6 +186,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return number of task this connectable has had over the last 5 minutes
*/
+ @ApiModelProperty(
+ value = "The total number of task this connectable has completed over the last 5 minutes."
+ )
public String getTasks() {
return tasks;
}
@@ -165,6 +200,9 @@ public class ProcessorStatusDTO extends StatusDTO {
/**
* @return total duration of all tasks for this connectable over the last 5 minutes
*/
+ @ApiModelProperty(
+ value = "The total duration of all tasks for this connectable over the last 5 minutes."
+ )
public String getTasksDuration() {
return tasksDuration;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
index 58f6161..6778b0d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemotePortStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -33,6 +34,9 @@ public class RemotePortStatusDTO {
/**
* @return id of the connection this remote port is connected to
*/
+ @ApiModelProperty(
+ value = "The id of the conneciton the remote is connected to."
+ )
public String getConnectionId() {
return connectionId;
}
@@ -44,6 +48,9 @@ public class RemotePortStatusDTO {
/**
* @return id of the remote port
*/
+ @ApiModelProperty(
+ value = "The id of the remote port."
+ )
public String getId() {
return id;
}
@@ -55,6 +62,9 @@ public class RemotePortStatusDTO {
/**
* @return name of the remote port
*/
+ @ApiModelProperty(
+ value = "The name of the remote port."
+ )
public String getName() {
return name;
}
@@ -66,6 +76,9 @@ public class RemotePortStatusDTO {
/**
* @return whether or not the remote port exists
*/
+ @ApiModelProperty(
+ value = "Whether or not the remote port exists."
+ )
public Boolean getExists() {
return exists;
}
@@ -77,6 +90,9 @@ public class RemotePortStatusDTO {
/**
* @return whether or not the remote port is running
*/
+ @ApiModelProperty(
+ value = "Whether or not the remote port is running."
+ )
public Boolean getRunning() {
return running;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
index 5f7c2c1..f556deb 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/RemoteProcessGroupStatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
@@ -40,6 +41,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return The id for the remote process group
*/
+ @ApiModelProperty(
+ value = "The id of the remote process group."
+ )
public String getId() {
return id;
}
@@ -51,6 +55,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return id of the group this remote process group is in
*/
+ @ApiModelProperty(
+ value = "The id of the parent process group the remote process group resides in."
+ )
public String getGroupId() {
return groupId;
}
@@ -62,6 +69,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return URI of the target system
*/
+ @ApiModelProperty(
+ value = "The URI of the target system."
+ )
public String getTargetUri() {
return targetUri;
}
@@ -73,6 +83,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return name of this remote process group
*/
+ @ApiModelProperty(
+ value = "The name of the remote process group."
+ )
public String getName() {
return name;
}
@@ -84,6 +97,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return transmission status of this remote process group
*/
+ @ApiModelProperty(
+ value = "The transmission status of the remote process group."
+ )
public String getTransmissionStatus() {
return transmissionStatus;
}
@@ -95,6 +111,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return number of active threads
*/
+ @ApiModelProperty(
+ value = "The number of active threads for the remote process group."
+ )
public Integer getActiveThreadCount() {
return activeThreadCount;
}
@@ -106,6 +125,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return any remote authorization issues for this remote process group
*/
+ @ApiModelProperty(
+ value = "Any remote authorization issues for the remote process group."
+ )
public List<String> getAuthorizationIssues() {
return authorizationIssues;
}
@@ -117,6 +139,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return Formatted description of the amount of data sent to this remote process group
*/
+ @ApiModelProperty(
+ value = "The count/size of the flowfiles sent to the remote process group in the last 5 minutes."
+ )
public String getSent() {
return sent;
}
@@ -128,6 +153,9 @@ public class RemoteProcessGroupStatusDTO extends StatusDTO {
/**
* @return Formatted description of the amount of data received from this remote process group
*/
+ @ApiModelProperty(
+ value = "The count/size of the flowfiles received from the remote process group in the last 5 minutes."
+ )
public String getReceived() {
return received;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
index e922b70..39b9c06 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.xml.bind.annotation.XmlType;
import org.apache.nifi.web.api.dto.BulletinDTO;
@@ -31,6 +32,9 @@ public abstract class StatusDTO {
/**
* @return Bulletins for this component
*/
+ @ApiModelProperty(
+ value = "The current bulletins for the component."
+ )
public List<BulletinDTO> getBulletins() {
return bulletins;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
index 65823d5..0a3c418 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusDescriptorDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -25,7 +26,6 @@ import javax.xml.bind.annotation.XmlType;
public class StatusDescriptorDTO {
public enum Formatter {
-
COUNT,
DURATION,
DATA_SIZE
@@ -49,6 +49,9 @@ public class StatusDescriptorDTO {
/**
* @return name of this status field
*/
+ @ApiModelProperty(
+ value = "The name of the status field."
+ )
public String getField() {
return field;
}
@@ -60,6 +63,9 @@ public class StatusDescriptorDTO {
/**
* @return label of this status field
*/
+ @ApiModelProperty(
+ value = "The label for the status field."
+ )
public String getLabel() {
return label;
}
@@ -71,6 +77,9 @@ public class StatusDescriptorDTO {
/**
* @return description of this status field
*/
+ @ApiModelProperty(
+ value = "The description of the status field."
+ )
public String getDescription() {
return description;
}
@@ -82,6 +91,9 @@ public class StatusDescriptorDTO {
/**
* @return formatter for this descriptor
*/
+ @ApiModelProperty(
+ value = "The formatter for the status descriptor."
+ )
public String getFormatter() {
return formatter;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
index a996365..c0ef33b 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
@@ -40,6 +41,9 @@ public class StatusHistoryDTO {
* @return when this status history was generated
*/
@XmlJavaTypeAdapter(TimeAdapter.class)
+ @ApiModelProperty(
+ value = "The timestamp when the status history was generated."
+ )
public Date getGenerated() {
return generated;
}
@@ -51,6 +55,9 @@ public class StatusHistoryDTO {
/**
* @return The component details for this status history
*/
+ @ApiModelProperty(
+ value = "The component details for the status history."
+ )
public LinkedHashMap<String, String> getDetails() {
return details;
}
@@ -62,6 +69,9 @@ public class StatusHistoryDTO {
/**
* @return Descriptors for each supported status field
*/
+ @ApiModelProperty(
+ value = "The descriptor for each support status field."
+ )
public List<StatusDescriptorDTO> getFieldDescriptors() {
return fieldDescriptors;
}
@@ -73,6 +83,9 @@ public class StatusHistoryDTO {
/**
* @return The status snapshots
*/
+ @ApiModelProperty(
+ value = "The status snapshots."
+ )
public List<StatusSnapshotDTO> getStatusSnapshots() {
return statusSnapshots;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
index 4ebb5e3..e78641e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusHistoryDetailDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlType;
/**
@@ -30,6 +31,9 @@ public class StatusHistoryDetailDTO {
/**
* @return label for this status detail
*/
+ @ApiModelProperty(
+ value = "The label for the status detail."
+ )
public String getLabel() {
return label;
}
@@ -41,6 +45,9 @@ public class StatusHistoryDetailDTO {
/**
* @return value for this status detail
*/
+ @ApiModelProperty(
+ value = "The value for the status detail."
+ )
public String getValue() {
return value;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
index b39fd60..24d801f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/status/StatusSnapshotDTO.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.dto.status;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.util.Map;
import javax.xml.bind.annotation.XmlType;
@@ -32,6 +33,9 @@ public class StatusSnapshotDTO {
/**
* @return timestamp of this snapshot
*/
+ @ApiModelProperty(
+ value = "The timestamp of the snapshot."
+ )
public Date getTimestamp() {
return timestamp;
}
@@ -43,6 +47,9 @@ public class StatusSnapshotDTO {
/**
* @return status metrics
*/
+ @ApiModelProperty(
+ value = "The status metrics."
+ )
public Map<String, Long> getStatusMetrics() {
return statusMetrics;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
index e2bb3e7..ad3a7de 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/Entity.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.web.api.entity;
+import com.wordnik.swagger.annotations.ApiModelProperty;
import javax.xml.bind.annotation.XmlRootElement;
import org.apache.nifi.web.api.dto.RevisionDTO;
@@ -30,6 +31,9 @@ public class Entity {
/**
* @return revision for this request/response
*/
+ @ApiModelProperty(
+ value = "The revision for this request/response. The revision is required for any mutable flow requests and is included in all responses."
+ )
public RevisionDTO getRevision() {
return revision;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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 5a87ff8..20afb61 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>
@@ -89,6 +39,69 @@
<reuseForks>false</reuseForks>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.github.kongchen</groupId>
+ <artifactId>swagger-maven-plugin</artifactId>
+ <version>3.0-M1</version>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <apiSources>
+ <apiSource>
+ <locations>org.apache.nifi.web.api</locations>
+ <schemes>http,https</schemes>
+ <basePath>/nifi-api</basePath>
+ <info>
+ <title>NiFi Rest Api</title>
+ <version>${project.version}</version>
+ <description>
+ The Rest Api provides programmatic access to command and control a NiFi instance in real time. Start and
+ stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description,
+ definitions of the expected input and output, potential response codes, and the authorities required
+ to invoke each service.
+ </description>
+ <contact>
+ <email>dev@nifi.incubator.apache.org</email>
+ <url>https://nifi.incubator.apache.org</url>
+ </contact>
+ <license>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <name>Apache 2.0</name>
+ </license>
+ </info>
+ <templatePath>classpath:/templates/index.html.hbs</templatePath>
+ <outputPath>${project.build.directory}/${project.artifactId}-${project.version}/docs/rest-api/index.html</outputPath>
+ <swaggerDirectory>${project.build.directory}/swagger-ui</swaggerDirectory>
+ </apiSource>
+ </apiSources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/docs/rest-api/images</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources/images</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -113,21 +126,9 @@
<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-client-dto</artifactId>
- <classifier>sources</classifier>
- <scope>provided</scope>
- <optional>true</optional>
- <version>0.1.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -198,6 +199,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<scope>provided</scope>
@@ -208,6 +214,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>provided</scope>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/997ed946/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/997ed946/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/997ed946/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/997ed946/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 7c59cea..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
@@ -16,8 +16,16 @@
*/
package org.apache.nifi.web.api;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiResponse;
+import com.wordnik.swagger.annotations.ApiResponses;
+import com.wordnik.swagger.annotations.Authorization;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
+import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
@@ -32,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;
@@ -40,6 +47,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
/**
* RESTful endpoint for managing a Template.
*/
+@Api(hidden = true)
public class BulletinBoardResource extends ApplicationResource {
private static final Logger logger = LoggerFactory.getLogger(BulletinBoardResource.class);
@@ -49,8 +57,11 @@ public class BulletinBoardResource extends ApplicationResource {
/**
* Retrieves all the of templates in this NiFi.
*
- * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
- * @param after Supporting querying for bulletins after a particular bulletin id.
+ * @param clientId Optional client id. If the client id is not specified, a
+ * new one will be generated. This value (whether specified or generated) is
+ * included in the response.
+ * @param after Supporting querying for bulletins after a particular
+ * bulletin id.
* @param limit The max number of bulletins to return.
* @param sourceName Source name filter. Supports a regular expression.
* @param message Message filter. Supports a regular expression.
@@ -59,13 +70,63 @@ public class BulletinBoardResource extends ApplicationResource {
* @return A bulletinBoardEntity.
*/
@GET
+ @Consumes(MediaType.WILDCARD)
@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)
- public Response getBulletinBoard(@QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
- @QueryParam("after") LongParameter after, @QueryParam("sourceName") BulletinBoardPatternParameter sourceName,
- @QueryParam("message") BulletinBoardPatternParameter message, @QueryParam("sourceId") BulletinBoardPatternParameter sourceId,
- @QueryParam("groupId") BulletinBoardPatternParameter groupId, @QueryParam("limit") IntegerParameter limit) {
+ @ApiOperation(
+ value = "Gets current bulletins",
+ response = BulletinBoardEntity.class,
+ authorizations = {
+ @Authorization(value = "Read Only", type = "ROLE_MONITOR"),
+ @Authorization(value = "Data Flow Manager", type = "ROLE_DFM"),
+ @Authorization(value = "Administrator", type = "ROLE_ADMIN")
+ }
+ )
+ @ApiResponses(
+ value = {
+ @ApiResponse(code = 400, message = "NiFi was unable to complete the request because it was invalid. The request should not be retried without modification."),
+ @ApiResponse(code = 401, message = "Client could not be authenticated."),
+ @ApiResponse(code = 403, message = "Client is not authorized to make this request."),
+ @ApiResponse(code = 409, message = "The request was valid but NiFi was not in the appropriate state to process it. Retrying the same request later may be successful.")
+ }
+ )
+ public Response getBulletinBoard(
+ @ApiParam(
+ value = "If the client id is not specified, new one will be generated. This value (whether specified or generated) is included in the response.",
+ required = false
+ )
+ @QueryParam(CLIENT_ID) @DefaultValue(StringUtils.EMPTY) ClientIdParameter clientId,
+ @ApiParam(
+ value = "Includes bulletins with an id after this value.",
+ required = false
+ )
+ @QueryParam("after") LongParameter after,
+ @ApiParam(
+ value = "Includes bulletins originating from this sources whose name match this regular expression.",
+ required = false
+ )
+ @QueryParam("sourceName") BulletinBoardPatternParameter sourceName,
+ @ApiParam(
+ value = "Includes bulletins whose message that match this regular expression.",
+ required = false
+ )
+ @QueryParam("message") BulletinBoardPatternParameter message,
+ @ApiParam(
+ value = "Includes bulletins originating from this sources whose id match this regular expression.",
+ required = false
+ )
+ @QueryParam("sourceId") BulletinBoardPatternParameter sourceId,
+ @ApiParam(
+ value = "Includes bulletins originating from this sources whose group id match this regular expression.",
+ required = false
+ )
+ @QueryParam("groupId") BulletinBoardPatternParameter groupId,
+ @ApiParam(
+ value = "The number of bulletins to limit the response to.",
+ required = false
+ )
+ @QueryParam("limit") IntegerParameter limit) {
// build the bulletin query
final BulletinQueryDTO query = new BulletinQueryDTO();
[25/54] [abbrv] incubator-nifi git commit: NIFI-585: - Addressing
ambiguous method overload by renaming version that accepts the legacy
annotation.
Posted by ma...@apache.org.
NIFI-585:
- Addressing ambiguous method overload by renaming version that accepts the legacy annotation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e98c074f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e98c074f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e98c074f
Branch: refs/heads/master
Commit: e98c074fc9455cfb0011cdcab59865f3fe6b8946
Parents: 4d8a14a
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon May 4 14:52:02 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon May 4 14:52:02 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/controller/FlowController.java | 2 +-
.../scheduling/EventDrivenSchedulingAgent.java | 2 +-
.../scheduling/StandardProcessScheduler.java | 8 +++---
.../tasks/ContinuallyRunConnectableTask.java | 2 +-
.../tasks/ContinuallyRunProcessorTask.java | 2 +-
.../controller/tasks/ReportingTaskWrapper.java | 2 +-
.../nifi/groups/StandardProcessGroup.java | 4 +--
.../org/apache/nifi/util/ReflectionUtils.java | 27 ++++++++++++++++----
8 files changed, 33 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 6c655cb..2ffdd4e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -822,7 +822,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R
if (firstTimeAdded) {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
- ReflectionUtils.invokeMethodsWithAnnotation(OnAdded.class, org.apache.nifi.processor.annotation.OnAdded.class, processor);
+ ReflectionUtils.invokeMethodsWithAnnotations(OnAdded.class, org.apache.nifi.processor.annotation.OnAdded.class, processor);
} catch (final Exception e) {
logRepository.removeObserver(StandardProcessorNode.BULLETIN_OBSERVER_ID);
throw new ComponentLifeCycleException("Failed to invoke @OnAdded methods of " + procNode.getProcessor(), e);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
index 77ae686..e5582ec 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
@@ -295,7 +295,7 @@ public class EventDrivenSchedulingAgent implements SchedulingAgent {
} finally {
if (!scheduleState.isScheduled() && scheduleState.getActiveThreadCount() == 1 && scheduleState.mustCallOnStoppedMethods()) {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, worker, processContext);
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, worker, processContext);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index ffa669d..7bcecf3 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -180,7 +180,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
try {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
- ReflectionUtils.invokeMethodsWithAnnotation(OnConfigured.class, OnScheduled.class, reportingTask, taskNode.getConfigurationContext());
+ ReflectionUtils.invokeMethodsWithAnnotations(OnScheduled.class, OnConfigured.class, reportingTask, taskNode.getConfigurationContext());
}
break;
@@ -227,7 +227,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
try {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
- ReflectionUtils.invokeMethodsWithAnnotation(OnUnscheduled.class, org.apache.nifi.processor.annotation.OnUnscheduled.class, reportingTask, configurationContext);
+ ReflectionUtils.invokeMethodsWithAnnotations(OnUnscheduled.class, org.apache.nifi.processor.annotation.OnUnscheduled.class, reportingTask, configurationContext);
}
} catch (final Exception e) {
final Throwable cause = (e instanceof InvocationTargetException) ? e.getCause() : e;
@@ -247,7 +247,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
agent.unschedule(taskNode, scheduleState);
if (scheduleState.getActiveThreadCount() == 0 && scheduleState.mustCallOnStoppedMethods()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, reportingTask, configurationContext);
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, reportingTask, configurationContext);
}
}
};
@@ -322,7 +322,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
}
final SchedulingContext schedulingContext = new StandardSchedulingContext(processContext, controllerServiceProvider, procNode);
- ReflectionUtils.invokeMethodsWithAnnotation(OnScheduled.class, org.apache.nifi.processor.annotation.OnScheduled.class, procNode.getProcessor(), schedulingContext);
+ ReflectionUtils.invokeMethodsWithAnnotations(OnScheduled.class, org.apache.nifi.processor.annotation.OnScheduled.class, procNode.getProcessor(), schedulingContext);
getSchedulingAgent(procNode).schedule(procNode, scheduleState);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
index a824ad0..0380e6e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunConnectableTask.java
@@ -94,7 +94,7 @@ public class ContinuallyRunConnectableTask implements Callable<Boolean> {
} finally {
if (!scheduleState.isScheduled() && scheduleState.getActiveThreadCount() == 1 && scheduleState.mustCallOnStoppedMethods()) {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, connectable, processContext);
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, connectable, processContext);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
index efa5814..7a85274 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ContinuallyRunProcessorTask.java
@@ -168,7 +168,7 @@ public class ContinuallyRunProcessorTask implements Callable<Boolean> {
// invoke the OnStopped methods
if (!scheduleState.isScheduled() && scheduleState.getActiveThreadCount() == 1 && scheduleState.mustCallOnStoppedMethods()) {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, procNode.getProcessor(), processContext);
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class, procNode.getProcessor(), processContext);
flowController.heartbeat();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
index 5724bb4..77f60b5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
@@ -52,7 +52,7 @@ public class ReportingTaskWrapper implements Runnable {
// invoke the OnStopped methods
if (!scheduleState.isScheduled() && scheduleState.getActiveThreadCount() == 1 && scheduleState.mustCallOnStoppedMethods()) {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(
OnStopped.class, org.apache.nifi.processor.annotation.OnStopped.class,
taskNode.getReportingTask(), taskNode.getConfigurationContext());
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index c7baef4..9fbfb5d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -332,7 +332,7 @@ public final class StandardProcessGroup implements ProcessGroup {
for (final ProcessorNode node : procGroup.getProcessors()) {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
final StandardProcessContext processContext = new StandardProcessContext(node, controllerServiceProvider, encryptor);
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, node.getProcessor(), processContext);
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnShutdown.class, org.apache.nifi.processor.annotation.OnShutdown.class, node.getProcessor(), processContext);
}
}
@@ -672,7 +672,7 @@ public final class StandardProcessGroup implements ProcessGroup {
try (final NarCloseable x = NarCloseable.withNarLoader()) {
final StandardProcessContext processContext = new StandardProcessContext(processor, controllerServiceProvider, encryptor);
- ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnRemoved.class, org.apache.nifi.processor.annotation.OnRemoved.class, processor.getProcessor(), processContext);
+ ReflectionUtils.quietlyInvokeMethodsWithAnnotations(OnRemoved.class, org.apache.nifi.processor.annotation.OnRemoved.class, processor.getProcessor(), processContext);
} catch (final Exception e) {
throw new ComponentLifeCycleException("Failed to invoke 'OnRemoved' methods of " + processor, e);
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e98c074f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
index 5140e31..4588b9e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/util/ReflectionUtils.java
@@ -44,7 +44,7 @@ public class ReflectionUtils {
*/
public static void invokeMethodsWithAnnotation(
final Class<? extends Annotation> annotation, final Object instance, final Object... args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
- invokeMethodsWithAnnotation(annotation, null, instance, args);
+ invokeMethodsWithAnnotations(annotation, null, instance, args);
}
/**
@@ -60,7 +60,7 @@ public class ReflectionUtils {
* @throws IllegalArgumentException ex
* @throws IllegalAccessException ex
*/
- public static void invokeMethodsWithAnnotation(
+ public static void invokeMethodsWithAnnotations(
final Class<? extends Annotation> preferredAnnotation, final Class<? extends Annotation> alternateAnnotation, final Object instance, final Object... args)
throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
final List<Class<? extends Annotation>> annotationClasses = new ArrayList<>(alternateAnnotation == null ? 1 : 2);
@@ -137,7 +137,7 @@ public class ReflectionUtils {
* invoked; if <code>false</code> is returned, an error will have been logged.
*/
public static boolean quietlyInvokeMethodsWithAnnotation(final Class<? extends Annotation> annotation, final Object instance, final Object... args) {
- return quietlyInvokeMethodsWithAnnotation(annotation, null, instance, null, args);
+ return quietlyInvokeMethodsWithAnnotations(annotation, null, instance, null, args);
}
/**
@@ -153,7 +153,24 @@ public class ReflectionUtils {
* invoked; if <code>false</code> is returned, an error will have been logged.
*/
public static boolean quietlyInvokeMethodsWithAnnotation(final Class<? extends Annotation> annotation, final Object instance, final ProcessorLog logger, final Object... args) {
- return quietlyInvokeMethodsWithAnnotation(annotation, null, instance, logger, args);
+ return quietlyInvokeMethodsWithAnnotations(annotation, null, instance, logger, args);
+ }
+
+ /**
+ * Invokes all methods on the given instance that have been annotated with the given preferredAnnotation and if no such method exists will invoke all methods on the given instance that have been
+ * annotated with the given alternateAnnotation, if any exists. If the signature of the method that is defined in <code>instance</code> uses 1 or more parameters, those parameters must be
+ * specified by the <code>args</code> parameter. However, if more arguments are supplied by the <code>args</code> parameter than needed, the extra arguments will be ignored.
+ *
+ * @param preferredAnnotation preferred
+ * @param alternateAnnotation alternate
+ * @param instance instance
+ * @param args args
+ * @return <code>true</code> if all appropriate methods were invoked and returned without throwing an Exception, <code>false</code> if one of the methods threw an Exception or could not be
+ * invoked; if <code>false</code> is returned, an error will have been logged.
+ */
+ public static boolean quietlyInvokeMethodsWithAnnotations(
+ final Class<? extends Annotation> preferredAnnotation, final Class<? extends Annotation> alternateAnnotation, final Object instance, final Object... args) {
+ return quietlyInvokeMethodsWithAnnotations(preferredAnnotation, alternateAnnotation, instance, null, args);
}
/**
@@ -169,7 +186,7 @@ public class ReflectionUtils {
* @return <code>true</code> if all appropriate methods were invoked and returned without throwing an Exception, <code>false</code> if one of the methods threw an Exception or could not be
* invoked; if <code>false</code> is returned, an error will have been logged.
*/
- public static boolean quietlyInvokeMethodsWithAnnotation(
+ public static boolean quietlyInvokeMethodsWithAnnotations(
final Class<? extends Annotation> preferredAnnotation, final Class<? extends Annotation> alternateAnnotation, final Object instance, final ProcessorLog logger, final Object... args) {
final List<Class<? extends Annotation>> annotationClasses = new ArrayList<>(alternateAnnotation == null ? 1 : 2);
annotationClasses.add(preferredAnnotation);
[51/54] [abbrv] incubator-nifi git commit: NIFI-429: prepare release
nifi-0.1.0-incubating-rc13
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
index f266835..8f8eaf8 100644
--- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hl7-processors</artifactId>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-query-language</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
index 3f9fbce..6e613ae 100644
--- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-hl7-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
index 141e856..7c72d18 100644
--- a/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-jetty-bundle</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
index ac6b110..b3c9eba 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-kafka-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
index d598a51..e39799d 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-kafka-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
index 74fef70..bca0b6c 100644
--- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-kafka-bundle</artifactId>
<packaging>pom</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
index 66d837c..03791c4 100644
--- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-nar/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-kite-nar</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
index 938854d..d003db0 100644
--- a/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-kite-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
index 21e378d..94b9631 100644
--- a/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-kite-bundle</artifactId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
index 4d8b790..0ac832b 100644
--- a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-language-translation-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-yandex-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
index 03776ca..2dc5830 100644
--- a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-yandex-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
index 830da21..c85dadc 100644
--- a/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-language-translation-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
index dc0affc..d559d60 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-persistent-provenance-repository</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
index 613ca50..8cffcc8 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-provenance-repository-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-provenance-repository-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
index 6f8c3f5..4ae92d1 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-volatile-provenance-repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-volatile-provenance-repository</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
index 7bf9515..68d0971 100644
--- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-provenance-repository-bundle</artifactId>
<packaging>pom</packaging>
@@ -31,12 +31,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-persistent-provenance-repository</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-volatile-provenance-repository</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
index 6da74dd..64403a9 100644
--- a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-social-media-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-twitter-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index 4768dbc..ab4f020 100644
--- a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-twitter-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
index 5aadbce..ee30048 100644
--- a/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-social-media-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-social-media-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
index aeab88c..3c1009a 100644
--- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-solr-nar</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
index df8e451..3a862d2 100644
--- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-solr-processors</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
index e027a63..027806b 100644
--- a/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-solr-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
index 576a328..474972e 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-content-viewer</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
index 15b285d..d02e910 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-standard-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
index e837ec8..4bdadcf 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-prioritizers/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index e989208..134d589 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-standard-processors</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
index a110f7e..5abbab2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-standard-reporting-tasks</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 6c00f1f..83601ea 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-standard-bundle</artifactId>
<packaging>pom</packaging>
@@ -35,23 +35,23 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-processors</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-reporting-tasks</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-content-viewer</artifactId>
<type>war</type>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
index 8b26d0f..859de29 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-client-service-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
index 69b39fb..d673adf 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-client-service/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-distributed-cache-client-service</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
index b4f082f..8607357 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-protocol/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-distributed-cache-protocol</artifactId>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
index db0ca43..9230603 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-distributed-cache-server</artifactId>
<description>Provides a Controller Service for hosting Distributed Caches</description>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
index e802e64..86e881e 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-services-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-distributed-cache-services-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
index ff51b00..a174ff3 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-distributed-cache-services-bundle</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
index 2f87d46..136165c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-http-context-map-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
index 2d6bd34..4ad8d6a 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-http-context-map-nar</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
index eb2abdd..3c68252 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-http-context-map</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
index bac46a7..359aca8 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-http-context-map-bundle</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
index aebfbb8..13dea5c 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-load-distribution-service-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-load-distribution-service-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
index 5054bbc..b3b2613 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-ssl-context-service-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
index ac00b02..dcc35bf 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-ssl-context-service</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
index 6a6e8cc..ed41095 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-ssl-context-bundle</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
index f84bbb7..c1cec41 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-service-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-ssl-context-service-api</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
index d57d8be..98c0196 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-standard-services-api-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
index 36dcec7..8ae78ed 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-standard-services/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-standard-services</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
index c8263aa..e49e64a 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-model/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-model</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
index a413124..eec4b3d 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-update-attribute-nar</artifactId>
<packaging>nar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
index a87eae9..837f8f8 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-processor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
index 14bc768..b54b1d6 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-update-attribute-ui</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
index 84aca3f..8a269ee 100644
--- a/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-update-attribute-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<artifactId>nifi-update-attribute-bundle</artifactId>
<packaging>pom</packaging>
@@ -34,18 +34,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-model</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-processor</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-ui</artifactId>
<type>war</type>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/nifi-nar-bundles/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/pom.xml b/nifi/nifi-nar-bundles/pom.xml
index 674bb92..aeb0de4 100644
--- a/nifi/nifi-nar-bundles/pom.xml
+++ b/nifi/nifi-nar-bundles/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
@@ -46,81 +46,81 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-load-distribution-service-api</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-api</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-protocol</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-server</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-volatile-provenance-repository</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>test</scope>
</dependency>
<!-- The following dependencies are marked provided because they must be provided by the container. Nars can assume they are there-->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/65a07b6b/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index 45f8b3f..4faa21d 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -22,7 +22,7 @@
<relativePath />
</parent>
<artifactId>nifi</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<packaging>pom</packaging>
<description>Apache NiFi(incubating) is an easy to use, powerful, and reliable system to process and distribute data.</description>
<modules>
@@ -609,67 +609,67 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-client</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-custom-ui-utilities</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ui-extension</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flowfile-packager</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-socket-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-bootstrap</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-resources</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<classifier>resources</classifier>
<scope>runtime</scope>
<type>zip</type>
@@ -677,7 +677,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-docs</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<classifier>resources</classifier>
<scope>runtime</scope>
<type>zip</type>
@@ -685,146 +685,146 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kite-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geo-nar</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-logging-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-processor-utils</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-write-ahead-log</artifactId>
- <version>0.1.0-incubating-SNAPSHOT</version>
+ <version>0.1.0-incubating</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
@@ -879,4 +879,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>nifi-0.1.0-incubating-rc13</tag>
+ </scm>
</project>
[14/54] [abbrv] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b6b8c95b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b6b8c95b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b6b8c95b
Branch: refs/heads/master
Commit: b6b8c95bf440b3d0467fa678adff543619ea0494
Parents: be12203 4f35637
Author: Matt Gilman <ma...@gmail.com>
Authored: Sat May 2 16:41:42 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sat May 2 16:41:42 2015 -0400
----------------------------------------------------------------------
.../ClusterManagerProtocolSenderImplTest.java | 9 +-
.../impl/SocketProtocolListenerTest.java | 133 ++++++++++++
.../ClusterManagerProtocolSenderImplTest.java | 144 -------------
.../impl/ClusterServiceLocatorTest.java | 121 -----------
.../impl/ClusterServicesBroadcasterTest.java | 132 ------------
.../impl/MulticastProtocolListenerTest.java | 171 ----------------
.../impl/NodeProtocolSenderImplTest.java | 202 -------------------
.../impl/SocketProtocolListenerTest.java | 133 ------------
.../testutils/DelayedProtocolHandler.java | 57 ------
.../testutils/ReflexiveProtocolHandler.java | 47 -----
10 files changed, 136 insertions(+), 1013 deletions(-)
----------------------------------------------------------------------
[20/54] [abbrv] incubator-nifi git commit: NIFI-576: - Fixing clear
button. - Fixing issue with default selection in search location combo. -
Showing 0% during initial search request.
Posted by ma...@apache.org.
NIFI-576:
- Fixing clear button.
- Fixing issue with default selection in search location combo.
- Showing 0% during initial search request.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/40438f12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/40438f12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/40438f12
Branch: refs/heads/master
Commit: 40438f12352a41fbb6de4c60b02153b48e15bf5f
Parents: a43eecf
Author: Matt Gilman <ma...@gmail.com>
Authored: Sun May 3 17:59:41 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sun May 3 17:59:41 2015 -0400
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/css/provenance.css | 3 ++-
.../webapp/js/nf/provenance/nf-provenance-lineage.js | 7 ++++++-
.../main/webapp/js/nf/provenance/nf-provenance-table.js | 12 ++++++++++--
3 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/40438f12/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
index 751a647..58a0bbc 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
@@ -238,6 +238,7 @@ input.searchable-field-input {
#provenance-search-location {
height: 18px;
line-height: 18px;
+ width: 424px;
}
/* event details dialog */
@@ -465,8 +466,8 @@ div.progress-label {
display: block;
font-weight: bold;
text-align: center;
- margin-top: -19px;
width: 378px;
+ margin-top: 4px;
}
/* provenance table */
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/40438f12/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
index 42c49cf..eb7c6de 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-lineage.js
@@ -44,7 +44,12 @@ nf.ProvenanceLineage = (function () {
handler: {
close: function () {
// reset the progress bar
- $('#lineage-percent-complete').progressbar('value', 0);
+ var lineageProgressBar = $('#lineage-percent-complete');
+ lineageProgressBar.find('div.progress-label').remove();
+
+ // update the progress bar
+ var label = $('<div class="progress-label"></div>').text('0%');
+ lineageProgressBar.progressbar('value', 0).append(label);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/40438f12/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
index 9451a34..499925d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
@@ -418,7 +418,12 @@ nf.ProvenanceTable = (function () {
handler: {
close: function () {
// reset the progress bar
- $('#provenance-percent-complete').progressbar('value', 0);
+ var provenanceProgressBar = $('#provenance-percent-complete');
+ provenanceProgressBar.find('div.progress-label').remove();
+
+ // update the progress bar
+ var label = $('<div class="progress-label"></div>').text('0%');
+ provenanceProgressBar.progressbar('value', 0).append(label);
}
}
});
@@ -535,7 +540,7 @@ nf.ProvenanceTable = (function () {
}
// reset the stored query
- query = {};
+ cachedQuery = {};
// reload the table
nf.ProvenanceTable.loadProvenanceTable();
@@ -975,6 +980,9 @@ nf.ProvenanceTable = (function () {
// update the progress bar
var label = $('<div class="progress-label"></div>').text(value + '%');
+ if (value > 0) {
+ label.css('margin-top', '-19px');
+ }
progressBar.progressbar('value', value).append(label);
},
[38/54] [abbrv] incubator-nifi git commit: NIFI-584 remove javadoc
author tags.
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
index 4e4a6b0..66a93e0 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteStreamCommand.java
@@ -37,7 +37,6 @@ import org.slf4j.LoggerFactory;
/**
*
- * @author
*/
public class TestExecuteStreamCommand {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
index bd975f2..9ed9d17 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
@@ -42,7 +42,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
/**
- * @author unattributed
*
*/
public class TestGetHTTP {
[41/54] [abbrv] incubator-nifi git commit: NIFI-584 remove javadoc
author tags.
Posted by ma...@apache.org.
NIFI-584 remove javadoc author tags.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c12778f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c12778f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c12778f1
Branch: refs/heads/master
Commit: c12778f17f593064bb51a37fc4e074a0574da355
Parents: e1aa489
Author: Sean Busbey <bu...@apache.org>
Authored: Wed May 6 00:56:44 2015 -0700
Committer: Aldrin Piri <al...@apache.org>
Committed: Wed May 6 12:43:48 2015 -0400
----------------------------------------------------------------------
.../main/java/org/apache/nifi/annotation/behavior/EventDriven.java | 1 -
.../java/org/apache/nifi/annotation/behavior/SideEffectFree.java | 1 -
.../java/org/apache/nifi/annotation/behavior/SupportsBatching.java | 1 -
.../java/org/apache/nifi/annotation/behavior/TriggerSerially.java | 1 -
.../annotation/behavior/TriggerWhenAnyDestinationAvailable.java | 1 -
.../java/org/apache/nifi/annotation/behavior/TriggerWhenEmpty.java | 1 -
.../apache/nifi/annotation/documentation/CapabilityDescription.java | 1 -
.../src/main/java/org/apache/nifi/annotation/lifecycle/OnAdded.java | 1 -
.../main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java | 1 -
.../main/java/org/apache/nifi/annotation/lifecycle/OnScheduled.java | 1 -
.../main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java | 1 -
.../main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java | 1 -
.../nifi/authorization/annotation/AuthorityProviderContext.java | 1 -
.../nifi/authorization/exception/ProviderCreationException.java | 1 -
.../nifi/authorization/exception/ProviderDestructionException.java | 1 -
.../src/main/java/org/apache/nifi/components/ValidationResult.java | 1 -
.../src/main/java/org/apache/nifi/components/Validator.java | 1 -
.../java/org/apache/nifi/controller/annotation/OnConfigured.java | 1 -
.../org/apache/nifi/controller/repository/RepositoryRecordType.java | 1 -
.../org/apache/nifi/controller/repository/claim/ContentClaim.java | 1 -
.../java/org/apache/nifi/controller/status/ConnectionStatus.java | 1 -
.../java/org/apache/nifi/controller/status/ProcessGroupStatus.java | 1 -
.../java/org/apache/nifi/controller/status/ProcessorStatus.java | 1 -
.../src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java | 1 -
.../nifi-api/src/main/java/org/apache/nifi/processor/Processor.java | 1 -
.../nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java | 1 -
.../src/main/java/org/apache/nifi/processor/Relationship.java | 1 -
.../org/apache/nifi/processor/annotation/CapabilityDescription.java | 1 -
.../main/java/org/apache/nifi/processor/annotation/EventDriven.java | 1 -
.../src/main/java/org/apache/nifi/processor/annotation/OnAdded.java | 1 -
.../main/java/org/apache/nifi/processor/annotation/OnRemoved.java | 1 -
.../main/java/org/apache/nifi/processor/annotation/OnScheduled.java | 1 -
.../main/java/org/apache/nifi/processor/annotation/OnShutdown.java | 1 -
.../main/java/org/apache/nifi/processor/annotation/OnStopped.java | 1 -
.../java/org/apache/nifi/processor/annotation/OnUnscheduled.java | 1 -
.../java/org/apache/nifi/processor/annotation/SideEffectFree.java | 1 -
.../java/org/apache/nifi/processor/annotation/SupportsBatching.java | 1 -
.../java/org/apache/nifi/processor/annotation/TriggerSerially.java | 1 -
.../processor/annotation/TriggerWhenAnyDestinationAvailable.java | 1 -
.../java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java | 1 -
.../apache/nifi/processor/exception/FlowFileAccessException.java | 1 -
.../apache/nifi/processor/exception/FlowFileHandlingException.java | 1 -
.../apache/nifi/processor/exception/MissingFlowFileException.java | 1 -
.../java/org/apache/nifi/processor/exception/ProcessException.java | 1 -
.../main/java/org/apache/nifi/processor/io/InputStreamCallback.java | 1 -
.../java/org/apache/nifi/processor/io/OutputStreamCallback.java | 1 -
nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java | 1 -
.../org/apache/nifi/provenance/StandardProvenanceEventRecord.java | 1 -
.../src/main/java/org/apache/nifi/logging/NiFiLog.java | 1 -
.../main/java/org/apache/nifi/security/util/EncryptionMethod.java | 1 -
.../main/java/org/apache/nifi/security/util/SslContextFactory.java | 1 -
.../org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java | 1 -
.../java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java | 1 -
.../src/main/java/org/apache/nifi/io/socket/SocketListener.java | 1 -
.../org/apache/nifi/io/socket/multicast/DiscoverableService.java | 1 -
.../apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java | 1 -
.../org/apache/nifi/io/socket/multicast/MulticastConfiguration.java | 1 -
.../apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java | 1 -
.../nifi/io/socket/multicast/MulticastServicesBroadcaster.java | 1 -
.../org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java | 1 -
.../java/org/apache/nifi/io/socket/multicast/MulticastUtils.java | 1 -
.../java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java | 1 -
.../org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java | 1 -
.../src/test/java/org/apache/nifi/io/nio/example/ServerMain.java | 1 -
.../src/test/java/org/apache/nifi/io/nio/example/TCPClient.java | 1 -
.../src/test/java/org/apache/nifi/io/nio/example/UDPClient.java | 1 -
.../java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java | 1 -
.../src/main/java/org/apache/nifi/util/file/FileUtils.java | 1 -
.../src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java | 1 -
.../src/main/java/org/apache/nifi/web/util/WebUtils.java | 1 -
.../cluster/authorization/protocol/message/DoesDnExistMessage.java | 1 -
.../authorization/protocol/message/GetAuthoritiesMessage.java | 1 -
.../authorization/protocol/message/GetGroupForUserMessage.java | 1 -
.../cluster/authorization/protocol/message/ProtocolMessage.java | 1 -
.../authorization/protocol/message/jaxb/JaxbProtocolUtils.java | 1 -
.../cluster/authorization/protocol/message/jaxb/ObjectFactory.java | 1 -
.../java/org/apache/nifi/cluster/protocol/ConnectionRequest.java | 1 -
.../src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java | 1 -
.../main/java/org/apache/nifi/cluster/protocol/NodeIdentifier.java | 1 -
.../main/java/org/apache/nifi/cluster/protocol/ProtocolContext.java | 1 -
.../java/org/apache/nifi/cluster/protocol/ProtocolException.java | 1 -
.../org/apache/nifi/cluster/protocol/ProtocolMessageMarshaller.java | 1 -
.../nifi/cluster/protocol/UnknownServiceAddressException.java | 1 -
.../cluster/protocol/impl/ClusterManagerProtocolSenderListener.java | 1 -
.../apache/nifi/cluster/protocol/impl/ClusterServiceLocator.java | 1 -
.../nifi/cluster/protocol/impl/ClusterServicesBroadcaster.java | 1 -
.../nifi/cluster/protocol/impl/MulticastProtocolListener.java | 1 -
.../apache/nifi/cluster/protocol/impl/SocketProtocolListener.java | 1 -
.../cluster/protocol/jaxb/message/AdaptedConnectionRequest.java | 1 -
.../cluster/protocol/jaxb/message/AdaptedConnectionResponse.java | 1 -
.../apache/nifi/cluster/protocol/jaxb/message/AdaptedCounter.java | 1 -
.../apache/nifi/cluster/protocol/jaxb/message/AdaptedDataFlow.java | 1 -
.../apache/nifi/cluster/protocol/jaxb/message/AdaptedHeartbeat.java | 1 -
.../nifi/cluster/protocol/jaxb/message/AdaptedNodeBulletins.java | 1 -
.../nifi/cluster/protocol/jaxb/message/AdaptedNodeIdentifier.java | 1 -
.../cluster/protocol/jaxb/message/ConnectionRequestAdapter.java | 1 -
.../cluster/protocol/jaxb/message/ConnectionResponseAdapter.java | 1 -
.../apache/nifi/cluster/protocol/jaxb/message/DataFlowAdapter.java | 1 -
.../apache/nifi/cluster/protocol/jaxb/message/HeartbeatAdapter.java | 1 -
.../nifi/cluster/protocol/jaxb/message/JaxbProtocolUtils.java | 1 -
.../nifi/cluster/protocol/jaxb/message/NodeBulletinsAdapter.java | 1 -
.../nifi/cluster/protocol/jaxb/message/NodeIdentifierAdapter.java | 1 -
.../apache/nifi/cluster/protocol/jaxb/message/ObjectFactory.java | 1 -
.../nifi/cluster/protocol/message/ConnectionRequestMessage.java | 1 -
.../cluster/protocol/message/ControllerStartupFailureMessage.java | 1 -
.../org/apache/nifi/cluster/protocol/message/DisconnectMessage.java | 1 -
.../org/apache/nifi/cluster/protocol/message/ExceptionMessage.java | 1 -
.../apache/nifi/cluster/protocol/message/FlowRequestMessage.java | 1 -
.../apache/nifi/cluster/protocol/message/FlowResponseMessage.java | 1 -
.../org/apache/nifi/cluster/protocol/message/HeartbeatMessage.java | 1 -
.../nifi/cluster/protocol/message/MulticastProtocolMessage.java | 1 -
.../apache/nifi/cluster/protocol/message/NodeBulletinsMessage.java | 1 -
.../java/org/apache/nifi/cluster/protocol/message/PingMessage.java | 1 -
.../nifi/cluster/protocol/message/PrimaryRoleAssignmentMessage.java | 1 -
.../nifi/cluster/protocol/message/ReconnectionRequestMessage.java | 1 -
.../nifi/cluster/protocol/message/ServiceBroadcastMessage.java | 1 -
.../nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java | 1 -
.../nifi/cluster/protocol/impl/ClusterServicesBroadcasterTest.java | 1 -
.../nifi/cluster/protocol/impl/SocketProtocolListenerTest.java | 1 -
.../cluster/protocol/impl/testutils/DelayedProtocolHandler.java | 1 -
.../cluster/protocol/impl/testutils/ReflexiveProtocolHandler.java | 1 -
.../src/main/java/org/apache/nifi/cluster/event/Event.java | 1 -
.../src/main/java/org/apache/nifi/cluster/event/EventManager.java | 1 -
.../java/org/apache/nifi/cluster/event/impl/EventManagerImpl.java | 1 -
.../src/main/java/org/apache/nifi/cluster/flow/ClusterDataFlow.java | 1 -
.../src/main/java/org/apache/nifi/cluster/flow/DaoException.java | 1 -
.../src/main/java/org/apache/nifi/cluster/flow/DataFlowDao.java | 1 -
.../main/java/org/apache/nifi/cluster/flow/PersistedFlowState.java | 1 -
.../main/java/org/apache/nifi/cluster/flow/StaleFlowException.java | 1 -
.../java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java | 1 -
.../nifi/cluster/flow/impl/DataFlowManagementServiceImpl.java | 1 -
.../main/java/org/apache/nifi/cluster/manager/ClusterManager.java | 1 -
.../java/org/apache/nifi/cluster/manager/HttpClusterManager.java | 1 -
.../java/org/apache/nifi/cluster/manager/HttpRequestReplicator.java | 1 -
.../java/org/apache/nifi/cluster/manager/HttpResponseMapper.java | 1 -
.../src/main/java/org/apache/nifi/cluster/manager/NodeResponse.java | 1 -
.../org/apache/nifi/cluster/manager/exception/ClusterException.java | 1 -
.../manager/exception/ConnectingNodeMutableRequestException.java | 1 -
.../manager/exception/DisconnectedNodeMutableRequestException.java | 1 -
.../cluster/manager/exception/IllegalClusterStateException.java | 1 -
.../cluster/manager/exception/IllegalNodeDeletionException.java | 1 -
.../manager/exception/IllegalNodeDisconnectionException.java | 1 -
.../cluster/manager/exception/IllegalNodeReconnectionException.java | 1 -
.../cluster/manager/exception/IneligiblePrimaryNodeException.java | 1 -
.../nifi/cluster/manager/exception/MutableRequestException.java | 1 -
.../nifi/cluster/manager/exception/NoConnectedNodesException.java | 1 -
.../cluster/manager/exception/NoResponseFromNodesException.java | 1 -
.../nifi/cluster/manager/exception/NodeDisconnectionException.java | 1 -
.../nifi/cluster/manager/exception/NodeReconnectionException.java | 1 -
.../cluster/manager/exception/PrimaryRoleAssignmentException.java | 1 -
.../cluster/manager/exception/SafeModeMutableRequestException.java | 1 -
.../apache/nifi/cluster/manager/exception/UnknownNodeException.java | 1 -
.../nifi/cluster/manager/exception/UriConstructionException.java | 1 -
.../apache/nifi/cluster/manager/impl/HttpResponseMapperImpl.java | 1 -
.../org/apache/nifi/cluster/manager/impl/WebClusterManager.java | 1 -
.../src/main/java/org/apache/nifi/cluster/node/Node.java | 1 -
.../org/apache/nifi/cluster/event/impl/EventManagerImplTest.java | 1 -
.../nifi/cluster/flow/impl/DataFlowManagementServiceImplTest.java | 1 -
.../nifi/cluster/manager/impl/HttpRequestReplicatorImplTest.java | 1 -
.../nifi/cluster/manager/impl/HttpResponseMapperImplTest.java | 1 -
.../java/org/apache/nifi/cluster/manager/testutils/HttpRequest.java | 1 -
.../org/apache/nifi/cluster/manager/testutils/HttpResponse.java | 1 -
.../apache/nifi/cluster/manager/testutils/HttpResponseAction.java | 1 -
.../java/org/apache/nifi/cluster/manager/testutils/HttpServer.java | 1 -
.../main/java/org/apache/nifi/controller/StandardFlowFileQueue.java | 1 -
.../apache/nifi/controller/repository/ContentNotFoundException.java | 1 -
.../src/main/java/org/apache/nifi/cluster/BulletinsPayload.java | 1 -
.../src/main/java/org/apache/nifi/cluster/ConnectionException.java | 1 -
.../main/java/org/apache/nifi/cluster/DisconnectionException.java | 1 -
.../src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java | 1 -
.../java/org/apache/nifi/controller/FlowSerializationException.java | 1 -
.../src/main/java/org/apache/nifi/controller/FlowSerializer.java | 1 -
.../org/apache/nifi/controller/FlowSynchronizationException.java | 1 -
.../src/main/java/org/apache/nifi/controller/FlowSynchronizer.java | 1 -
.../java/org/apache/nifi/controller/StandardFlowSynchronizer.java | 1 -
.../main/java/org/apache/nifi/controller/StandardProcessorNode.java | 1 -
.../java/org/apache/nifi/controller/UninheritableFlowException.java | 1 -
.../java/org/apache/nifi/controller/repository/ProcessContext.java | 1 -
.../apache/nifi/controller/repository/StandardFlowFileRecord.java | 1 -
.../apache/nifi/controller/repository/StandardProcessSession.java | 1 -
.../src/main/java/org/apache/nifi/diagnostics/DiagnosticUtils.java | 1 -
.../src/main/java/org/apache/nifi/diagnostics/StorageUsage.java | 1 -
.../main/java/org/apache/nifi/diagnostics/SystemDiagnostics.java | 1 -
.../java/org/apache/nifi/diagnostics/SystemDiagnosticsFactory.java | 1 -
.../src/main/java/org/apache/nifi/encrypt/EncryptionException.java | 1 -
.../main/java/org/apache/nifi/fingerprint/FingerprintException.java | 1 -
.../src/main/java/org/apache/nifi/jaxb/AdaptedCounter.java | 1 -
.../src/main/java/org/apache/nifi/jaxb/BulletinAdapter.java | 1 -
.../src/main/java/org/apache/nifi/jaxb/CounterAdapter.java | 1 -
.../src/main/java/org/apache/nifi/lifecycle/LifeCycle.java | 1 -
.../src/main/java/org/apache/nifi/lifecycle/LifeCycleException.java | 1 -
.../java/org/apache/nifi/lifecycle/LifeCycleStartException.java | 1 -
.../main/java/org/apache/nifi/lifecycle/LifeCycleStopException.java | 1 -
.../src/main/java/org/apache/nifi/services/FlowService.java | 1 -
.../src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java | 1 -
.../java/org/apache/nifi/controller/StandardFlowServiceTest.java | 1 -
.../java/org/apache/nifi/fingerprint/FingerprintFactoryTest.java | 1 -
.../src/main/java/org/apache/nifi/nar/ExtensionManager.java | 1 -
.../src/main/java/org/apache/nifi/util/FileUtils.java | 1 -
.../nifi/framework/security/util/SslContextCreationException.java | 1 -
.../org/apache/nifi/framework/security/util/SslContextFactory.java | 1 -
.../java/org/apache/nifi/framework/security/util/SslException.java | 1 -
.../security/util/SslServerSocketFactoryCreationException.java | 1 -
.../framework/security/util/SslSocketFactoryCreationException.java | 1 -
.../apache/nifi/framework/security/util/SslContextFactoryTest.java | 1 -
.../src/main/java/org/apache/nifi/aop/MethodProfiler.java | 1 -
.../src/main/java/org/apache/nifi/web/filter/NodeRequestFilter.java | 1 -
.../src/main/java/org/apache/nifi/web/filter/RequestLogger.java | 1 -
.../src/main/java/org/apache/nifi/web/filter/ThreadLocalFilter.java | 1 -
.../src/main/java/org/apache/nifi/web/filter/TimerFilter.java | 1 -
.../src/main/java/org/apache/nifi/web/ContentAccess.java | 1 -
.../src/main/java/org/apache/nifi/web/OptimisticLockingManager.java | 1 -
.../java/org/apache/nifi/web/StandardOptimisticLockingManager.java | 1 -
.../main/java/org/apache/nifi/web/security/user/NiFiUserUtils.java | 1 -
.../src/main/java/org/apache/nifi/web/filter/IeEdgeHeader.java | 1 -
.../main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java | 1 -
.../apache/nifi/processors/hadoop/util/OutputStreamWritable.java | 1 -
.../org/apache/nifi/processors/standard/ExecuteStreamCommand.java | 1 -
.../java/org/apache/nifi/processors/standard/RouteOnAttribute.java | 1 -
.../java/org/apache/nifi/processors/standard/util/BinManager.java | 1 -
.../java/org/apache/nifi/processors/standard/util/FTPUtils.java | 1 -
.../org/apache/nifi/processors/standard/util/UDPStreamConsumer.java | 1 -
.../apache/nifi/processors/standard/TestExecuteStreamCommand.java | 1 -
.../test/java/org/apache/nifi/processors/standard/TestGetHTTP.java | 1 -
224 files changed, 224 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/EventDriven.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/EventDriven.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/EventDriven.java
index 279a49e..c548b59 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/EventDriven.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/EventDriven.java
@@ -38,7 +38,6 @@ import java.lang.annotation.Target;
* eligible to be scheduled in Event-Driven mode.
* </p>
*
- * @author none
*/
@Documented
@Target({ElementType.TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SideEffectFree.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SideEffectFree.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SideEffectFree.java
index bd1e07d..9a64f4b 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SideEffectFree.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SideEffectFree.java
@@ -36,7 +36,6 @@ import java.lang.annotation.Target;
* effects on external services which could not be rolled back and thus all the
* processes could be safely repeated (implied idempotent behavior).
*
- * @author none
*/
@Documented
@Target({ElementType.TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SupportsBatching.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SupportsBatching.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SupportsBatching.java
index f5fd61f..807e637 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SupportsBatching.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/SupportsBatching.java
@@ -41,7 +41,6 @@ import java.lang.annotation.Target;
* ProcessSession.commit() to ensure data is persisted before deleting the data
* from a remote source.
*
- * @author none
*/
@Documented
@Target({ElementType.TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerSerially.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerSerially.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerSerially.java
index f2f100b..974e358 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerSerially.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerSerially.java
@@ -29,7 +29,6 @@ import java.lang.annotation.Target;
* concurrent execution of its onTrigger() method. By default, Processors are
* assumed to be safe for concurrent execution.
*
- * @author none
*/
@Documented
@Target({ElementType.TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenAnyDestinationAvailable.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenAnyDestinationAvailable.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenAnyDestinationAvailable.java
index 8f4da55..db115cb 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenAnyDestinationAvailable.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenAnyDestinationAvailable.java
@@ -30,7 +30,6 @@ import java.lang.annotation.Target;
* default, Processors are triggered only when all destinations report that they
* have available space (i.e., none of the outgoing Connections is full).
*
- * @author none
*/
@Documented
@Target({ElementType.TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenEmpty.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenEmpty.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenEmpty.java
index 0506c08..f442b80 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenEmpty.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/behavior/TriggerWhenEmpty.java
@@ -32,7 +32,6 @@ import java.lang.annotation.Target;
* only be triggered if they have work in their queue or they present this
* annotation.
*
- * @author none
*/
@Documented
@Target({ElementType.TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/CapabilityDescription.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/CapabilityDescription.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/CapabilityDescription.java
index 0bdbbc6..cff6743 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/CapabilityDescription.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/documentation/CapabilityDescription.java
@@ -30,7 +30,6 @@ import java.lang.annotation.Target;
* description to be provided. This description can be provided to a user in
* logs, UI, etc.
*
- * @author none
*/
@Documented
@Target({ElementType.TYPE})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnAdded.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnAdded.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnAdded.java
index b825335..95edc0a 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnAdded.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnAdded.java
@@ -43,7 +43,6 @@ import java.lang.annotation.Target;
* component will not be added to the flow.
* </p>
*
- * @author none
*/
@Documented
@Target({ElementType.METHOD})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java
index 120b652..54817e4 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnRemoved.java
@@ -46,7 +46,6 @@ import org.apache.nifi.processor.ProcessContext;
* of type {@link ProcessContext}.
* </p>
*
- * @author none
*/
@Documented
@Target({ElementType.METHOD})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnScheduled.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnScheduled.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnScheduled.java
index f5250ea..8fa752b 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnScheduled.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnScheduled.java
@@ -58,7 +58,6 @@ import java.lang.annotation.Target;
* will continue until the method succeeds, and the component will then be
* scheduled to run after this method return successfully.
*
- * @author none
*/
@Documented
@Target({ElementType.METHOD})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java
index dd47a31..44098ff 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnShutdown.java
@@ -44,7 +44,6 @@ import org.apache.nifi.processor.ProcessContext;
* {@link ProcessContext} if the component is a Processor.
* </p>
*
- * @author none
*/
@Documented
@Target({ElementType.METHOD})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java
index c2f2533..622f158 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/annotation/lifecycle/OnStopped.java
@@ -57,7 +57,6 @@ import org.apache.nifi.processor.ProcessContext;
* component is a Processor.
* </p>
*
- * @author none
*/
@Documented
@Target({ElementType.METHOD})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java
index 406c0c0..5ac2af7 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/annotation/AuthorityProviderContext.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
/**
*
*
- * @author none
*/
@Documented
@Target({ElementType.FIELD, ElementType.METHOD})
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java
index e2e7e1d..24ac793 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderCreationException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.authorization.exception;
/**
* Represents the exceptional case when an AuthorityProvider fails instantiated.
*
- * @author unattributed
*/
public class ProviderCreationException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java
index e275097..985d3fb 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/exception/ProviderDestructionException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.authorization.exception;
/**
* Represents the exceptional case when an AuthorityProvider fails destruction.
*
- * @author unattributed
*/
public class ProviderDestructionException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java
index 2736044..e0beec8 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/components/ValidationResult.java
@@ -22,7 +22,6 @@ import java.util.Objects;
*
* Immutable - thread safe
*
- * @author unattributed
*/
public class ValidationResult {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/components/Validator.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/components/Validator.java b/nifi/nifi-api/src/main/java/org/apache/nifi/components/Validator.java
index 768659b..a12b532 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/components/Validator.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/components/Validator.java
@@ -18,7 +18,6 @@ package org.apache.nifi.components;
/**
*
- * @author unattributed
*/
public interface Validator {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java
index 2aa90cc..aef80ac 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/annotation/OnConfigured.java
@@ -30,7 +30,6 @@ import java.lang.annotation.Target;
* arguments or a single argument of type
* {@link nifi.controller.ConfigurationContext ConfigurationContext}.
*
- * @author none
*
* @deprecated This annotation has been replaced by those in the
* {@link org.apache.nifi.annotation.lifecycle} package.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java
index 5ba52d9..ff8dc50 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/RepositoryRecordType.java
@@ -18,7 +18,6 @@ package org.apache.nifi.controller.repository;
/**
*
- * @author none
*/
public enum RepositoryRecordType {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
index 11a1620..53cc44f 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
@@ -25,7 +25,6 @@ package org.apache.nifi.controller.repository.claim;
* <p>
* Must be thread safe</p>
*
- * @author none
*/
public interface ContentClaim extends Comparable<ContentClaim> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java
index 453ac9d..cebb2b4 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ConnectionStatus.java
@@ -17,7 +17,6 @@
package org.apache.nifi.controller.status;
/**
- * @author unattributed
*/
public class ConnectionStatus implements Cloneable {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
index 45acf8e..eb0339f 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessGroupStatus.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
/**
- * @author unattributed
*/
public class ProcessGroupStatus implements Cloneable {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
index bd7778b..54be7ba 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/controller/status/ProcessorStatus.java
@@ -19,7 +19,6 @@ package org.apache.nifi.controller.status;
import java.util.concurrent.TimeUnit;
/**
- * @author unattributed
*/
public class ProcessorStatus implements Cloneable {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java b/nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
index 16d5962..684f454 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/flowfile/FlowFilePrioritizer.java
@@ -24,7 +24,6 @@ import java.util.Comparator;
* so if features of that content are necessary for prioritization it should be
* extracted to be used as an attribute of the flow file.
*
- * @author none
*/
public interface FlowFilePrioritizer extends Comparator<FlowFile> {
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java
index fcb04ea..53c7c70 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Processor.java
@@ -46,7 +46,6 @@ import org.apache.nifi.processor.exception.ProcessException;
* default no-args constructor to facilitate the java service loader
* mechanism.</p>
*
- * @author none
*/
public interface Processor extends ConfigurableComponent {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java
index 45d2d3a..c3c2ccc 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/QueueSize.java
@@ -18,7 +18,6 @@ package org.apache.nifi.processor;
/**
*
- * @author
*/
public class QueueSize {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java
index aa19fd0..d9f13be 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/Relationship.java
@@ -19,7 +19,6 @@ package org.apache.nifi.processor;
/**
* An immutable object for holding information about a type of relationship.
*
- * @author unattributed
*/
public final class Relationship implements Comparable<Relationship> {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java
index 8ca8290..f966f89 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/CapabilityDescription.java
@@ -27,7 +27,6 @@ import java.lang.annotation.Target;
* Annotation that may be placed on a processor allowing for a description to be
* provided. This description can be provided to a user in logs, UI, etc.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.documentation.CapabilityDescription}
* annotation.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java
index 53f1d72..0f412ca 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/EventDriven.java
@@ -38,7 +38,6 @@ import java.lang.annotation.Target;
* eligible to be scheduled in Event-Driven mode.
* </p>
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.behavior.EventDriven} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java
index 1c2b709..ff0b75f 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnAdded.java
@@ -31,7 +31,6 @@ import java.lang.annotation.Target;
* If any method annotated with this annotation throws, the processor will not
* be added to the graph.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.lifecycle.OnAdded} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java
index 239a449..740e9f8 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnRemoved.java
@@ -32,7 +32,6 @@ import java.lang.annotation.Target;
* If any method annotated with this annotation throws, the processor will not
* be removed from the graph.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.lifecycle.OnRemoved} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java
index 3a716e6..3815de2 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnScheduled.java
@@ -34,7 +34,6 @@ import java.lang.annotation.Target;
* If any method annotated with this annotation throws, the processor will not
* be scheduled to run.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.lifecycle.OnScheduled} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java
index 22ecc0b..930a9df 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnShutdown.java
@@ -28,7 +28,6 @@ import java.lang.annotation.Target;
* should be called whenever the flow is being shutdown. This will be called at
* most once for each processor instance in a process lifetime.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.lifecycle.OnShutdown} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java
index 223868e..4fbaf95 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnStopped.java
@@ -45,7 +45,6 @@ import java.lang.annotation.Target;
* longer scheduled to run, see the {@link OnUnscheduled} annotation.
* </p>
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.lifecycle.OnStopped} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java
index a231435..7b4c1f6 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/OnUnscheduled.java
@@ -36,7 +36,6 @@ import java.lang.annotation.Target;
* If any method annotated with this annotation throws, the processor will not
* be scheduled to run.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.lifecycle.OnUnscheduled} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java
index 99980c5..6c65caa 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SideEffectFree.java
@@ -35,7 +35,6 @@ import java.lang.annotation.Target;
* which could not be rolled back and thus all the processes could be safely
* repeated (implied idempotent behavior).
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.behavior.SideEffectFree} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java
index 7335a55..5b3d1aa 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/SupportsBatching.java
@@ -40,7 +40,6 @@ import java.lang.annotation.Target;
* ProcessSession.commit() to ensure data is persisted before deleting the data
* from a remote source.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.behavior.SupportsBatching} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java
index 52c1079..6e80cef 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerSerially.java
@@ -29,7 +29,6 @@ import java.lang.annotation.Target;
* method. By default processors are assumed to be thread safe for concurrent
* execution.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.behavior.TriggerSerially} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java
index 8e8e5df..6e01f6c 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenAnyDestinationAvailable.java
@@ -29,7 +29,6 @@ import java.lang.annotation.Target;
* for incoming FlowFiles. By default processors are triggered only when all
* destinations report that they have available space.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.behavior.TriggerWhenAnyDestinationAvailable}
* annotation.
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java
index f27b111..d068a9e 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/annotation/TriggerWhenEmpty.java
@@ -31,7 +31,6 @@ import java.lang.annotation.Target;
* have non-self incoming edges will only be triggered if they have work in
* their queue or they present this annotation.
*
- * @author none
* @deprecated This Annotation has been replaced by the
* {@link org.apache.nifi.annotation.behavior.TriggerWhenEmpty} annotation.
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java
index ac3559c..c7e9c22 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileAccessException.java
@@ -20,7 +20,6 @@ package org.apache.nifi.processor.exception;
* Indicates an issue occurred while accessing the content of a FlowFile, such
* as an IOException.
*
- * @author none
*/
public class FlowFileAccessException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java
index 82c8873..d5bf62d 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/FlowFileHandlingException.java
@@ -22,7 +22,6 @@ package org.apache.nifi.processor.exception;
* session. In any event this exception indicates a logic or programming error
* within the processor interacting with the offending session.
*
- * @author none
*/
public class FlowFileHandlingException extends ProcessException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java
index a198ace..700afd5 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/MissingFlowFileException.java
@@ -24,7 +24,6 @@ package org.apache.nifi.processor.exception;
* framework and it is not something any processor or the framework can recover
* so it must discard the object.
*
- * @author none
*/
public class MissingFlowFileException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java
index ca22778..f162b14 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/exception/ProcessException.java
@@ -19,7 +19,6 @@ package org.apache.nifi.processor.exception;
/**
* Indicates an issue occurred in user code while processing a FlowFile.
*
- * @author none
*/
public class ProcessException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java
index e850684..6873f2e 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/InputStreamCallback.java
@@ -21,7 +21,6 @@ import java.io.InputStream;
/**
*
- * @author unattributed
*/
public interface InputStreamCallback {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java
index e37c376..86fe1a7 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/processor/io/OutputStreamCallback.java
@@ -21,7 +21,6 @@ import java.io.OutputStream;
/**
*
- * @author unattributed
*/
public interface OutputStreamCallback {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java b/nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java
index 6fcdcaf..a4d36d2 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/web/Revision.java
@@ -22,7 +22,6 @@ import java.io.Serializable;
* A model object representing a revision. Equality is defined as either a
* matching version number or matching non-empty client IDs.
*
- * @author unattributed
* @Immutable
* @Threadsafe
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
index cfbae88..4eb7001 100644
--- a/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
+++ b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
@@ -32,7 +32,6 @@ import org.apache.nifi.processor.Relationship;
/**
* Holder for provenance relevant information
* <p/>
- * @author none
*/
public final class StandardProvenanceEventRecord implements ProvenanceEventRecord {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java b/nifi/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
index 7c71d85..3de8518 100644
--- a/nifi/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
+++ b/nifi/nifi-commons/nifi-logging-utils/src/main/java/org/apache/nifi/logging/NiFiLog.java
@@ -21,7 +21,6 @@ import org.slf4j.Marker;
/**
*
- * @author unattributed
*/
public class NiFiLog implements Logger {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java b/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
index 2c7cf23..55f5986 100644
--- a/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
+++ b/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/EncryptionMethod.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
* Enumeration capturing essential information about the various encryption
* methods that might be supported.
*
- * @author none
*/
public enum EncryptionMethod {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java b/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java
index aae8760..78cf6e6 100644
--- a/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java
+++ b/nifi/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/SslContextFactory.java
@@ -37,7 +37,6 @@ import javax.net.ssl.TrustManagerFactory;
* A factory for creating SSL contexts using the application's security
* properties.
*
- * @author unattributed
*/
public final class SslContextFactory {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java
index fce59c6..bb57e26 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/AbstractStreamConsumer.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
/**
*
- * @author none
*/
public abstract class AbstractStreamConsumer implements StreamConsumer {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java
index df298d5..ba858b6 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/nio/consumer/StreamConsumerFactory.java
@@ -18,7 +18,6 @@ package org.apache.nifi.io.nio.consumer;
/**
*
- * @author none
*/
public interface StreamConsumerFactory {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java
index e02791a..b509035 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/SocketListener.java
@@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory;
/**
* Implements a listener for TCP/IP messages sent over unicast socket.
*
- * @author unattributed
*/
public abstract class SocketListener {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java
index 7a62813..fc817e9 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableService.java
@@ -23,7 +23,6 @@ import java.net.InetSocketAddress;
* unique case-sensitive service name and a socket address where it is
* available.
*
- * @author unattributed
*/
public interface DiscoverableService {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java
index 5f378b9..3737e95 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/DiscoverableServiceImpl.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang3.StringUtils;
* A basic implementation of the DiscoverableService interface. To services are
* considered equal if they have the same case-sensitive service name.
*
- * @author unattributed
*/
public class DiscoverableServiceImpl implements DiscoverableService {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java
index ea0b72a..d1c2156 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.nifi.io.socket.multicast;
/**
- * @author unattributed
*/
public final class MulticastConfiguration {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java
index c254c11..212e20c 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServiceDiscovery.java
@@ -22,7 +22,6 @@ import java.net.InetSocketAddress;
* Defines the interface for discovering services based on name. Services are
* expected to be exposed via socket address and port.
*
- * @author unattributed
*/
public interface MulticastServiceDiscovery extends ServiceDiscovery {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java
index a3cff9b..7ef5a5d 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastServicesBroadcaster.java
@@ -21,7 +21,6 @@ import java.net.InetSocketAddress;
/**
* Defines the interface for broadcasting a service via multicast.
*
- * @author unattributed
*/
public interface MulticastServicesBroadcaster extends ServicesBroadcaster {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java
index dad1173..3e96c61 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastTimeToLive.java
@@ -17,7 +17,6 @@
package org.apache.nifi.io.socket.multicast;
/**
- * @author unattributed
*/
public enum MulticastTimeToLive {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java
index 8a8b7c0..84d76d2 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/MulticastUtils.java
@@ -23,7 +23,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author unattributed
*/
public final class MulticastUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java
index 173146e..74c1a30 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServiceDiscovery.java
@@ -19,7 +19,6 @@ package org.apache.nifi.io.socket.multicast;
/**
* Defines a generic interface for discovering services.
*
- * @author unattributed
*/
public interface ServiceDiscovery {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java
index 86260d8..2a9f9b2 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/main/java/org/apache/nifi/io/socket/multicast/ServicesBroadcaster.java
@@ -22,7 +22,6 @@ import java.util.Set;
* Defines the interface for broadcasting a collection of services for client
* discovery.
*
- * @author unattributed
*/
public interface ServicesBroadcaster {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java
index b5240c9..27d5ccc 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/ServerMain.java
@@ -37,7 +37,6 @@ import org.slf4j.LoggerFactory;
/**
*
- * @author none
*/
public final class ServerMain {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java
index 447d701..1c4b70c 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/TCPClient.java
@@ -24,7 +24,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author none
*/
public class TCPClient {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java
index 90f4c42..00a00a1 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UDPClient.java
@@ -24,7 +24,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author none
*/
public class UDPClient {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java
index 9ec26e9..107c087 100644
--- a/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java
+++ b/nifi/nifi-commons/nifi-socket-utils/src/test/java/org/apache/nifi/io/nio/example/UselessStreamConsumer.java
@@ -23,7 +23,6 @@ import org.apache.nifi.io.nio.consumer.AbstractStreamConsumer;
/**
*
- * @author none
*/
public class UselessStreamConsumer extends AbstractStreamConsumer {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java b/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
index daefd04..7661e2d 100644
--- a/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
+++ b/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/file/FileUtils.java
@@ -41,7 +41,6 @@ import org.slf4j.Logger;
/**
* A utility class containing a few useful static methods to do typical IO operations.
*
- * @author unattributed
*/
public class FileUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java b/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
index 0ac325c..d61ae6f 100644
--- a/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
+++ b/nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/search/ahocorasick/Node.java
@@ -23,7 +23,6 @@ import org.apache.nifi.util.search.SearchTerm;
/**
*
- * @author
*/
public class Node {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java b/nifi/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java
index 587b3d8..e27f91c 100644
--- a/nifi/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java
+++ b/nifi/nifi-commons/nifi-web-utils/src/main/java/org/apache/nifi/web/util/WebUtils.java
@@ -51,7 +51,6 @@ import com.sun.jersey.client.urlconnection.HTTPSProperties;
/**
* Common utilities related to web development.
*
- * @author unattributed
*/
public final class WebUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java
index 38d0dd8..5436140 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/DoesDnExistMessage.java
@@ -20,7 +20,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.nifi.cluster.authorization.protocol.message.ProtocolMessage.MessageType;
/**
- * @author unattributed
*/
@XmlRootElement(name = "doesDnExistMessage")
public class DoesDnExistMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java
index 347163f..50d371d 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetAuthoritiesMessage.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.nifi.authorization.Authority;
/**
- * @author unattributed
*/
@XmlRootElement(name = "getAuthoritiesMessage")
public class GetAuthoritiesMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java
index 717f244..72a6af5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/GetGroupForUserMessage.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cluster.authorization.protocol.message;
import javax.xml.bind.annotation.XmlRootElement;
/**
- * @author unattributed
*/
@XmlRootElement(name = "getGroupForUserMessage")
public class GetGroupForUserMessage extends ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java
index 102142a..ddeb69e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/ProtocolMessage.java
@@ -17,7 +17,6 @@
package org.apache.nifi.cluster.authorization.protocol.message;
/**
- * @author unattributed
*/
public abstract class ProtocolMessage {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java
index 97a1bc7..2a32d84 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/JaxbProtocolUtils.java
@@ -20,7 +20,6 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
/**
- * @author unattributed
*/
public final class JaxbProtocolUtils {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java
index 5cde335..2e70a19 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster-authorization-provider/src/main/java/org/apache/nifi/cluster/authorization/protocol/message/jaxb/ObjectFactory.java
@@ -22,7 +22,6 @@ import org.apache.nifi.cluster.authorization.protocol.message.GetAuthoritiesMess
import org.apache.nifi.cluster.authorization.protocol.message.GetGroupForUserMessage;
/**
- * @author unattributed
*/
@XmlRegistry
public class ObjectFactory {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java
index 63d1aa7..0e27155 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/ConnectionRequest.java
@@ -23,7 +23,6 @@ import org.apache.nifi.cluster.protocol.jaxb.message.ConnectionRequestAdapter;
* A node's request to connect to the cluster. The request contains a proposed
* identifier.
*
- * @author unattributed
*/
@XmlJavaTypeAdapter(ConnectionRequestAdapter.class)
public class ConnectionRequest {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c12778f1/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java
index 04fb3f0..80a4ba7 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/java/org/apache/nifi/cluster/protocol/Heartbeat.java
@@ -24,7 +24,6 @@ import org.apache.nifi.cluster.protocol.jaxb.message.HeartbeatAdapter;
/**
* A heartbeat for indicating the status of a node to the cluster.
*
- * @author unattributed
*/
@XmlJavaTypeAdapter(HeartbeatAdapter.class)
public class Heartbeat {
[35/54] [abbrv] incubator-nifi git commit: NIFI-592: - Adding Google
Analytics to generated documentation being deployed to the website.
Posted by ma...@apache.org.
NIFI-592:
- Adding Google Analytics to generated documentation being deployed to the website.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/81e40d43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/81e40d43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/81e40d43
Branch: refs/heads/master
Commit: 81e40d43480cc42a4e8e9edf1a6360c1a54449db
Parents: 251f0e5
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed May 6 10:04:18 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed May 6 10:04:18 2015 -0400
----------------------------------------------------------------------
nifi-site/Gruntfile.js | 23 ++++++++++++--
nifi-site/package.json | 49 ++++++++++++++++--------------
nifi-site/src/pages/html/rest-api.hbs | 2 +-
3 files changed, 48 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/81e40d43/nifi-site/Gruntfile.js
----------------------------------------------------------------------
diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js
index 731b172..baa4c21 100644
--- a/nifi-site/Gruntfile.js
+++ b/nifi-site/Gruntfile.js
@@ -77,7 +77,7 @@ module.exports = function (grunt) {
dest: 'dist/docs/',
rename: function (dest, src) {
var path = require('path');
-
+
if (src.indexOf('images') > 0) {
return path.join(dest, 'rest-api/images', path.basename(src));
} else {
@@ -129,6 +129,24 @@ module.exports = function (grunt) {
stderr: true
}
},
+ replace: {
+ addGoogleAnalytics: {
+ src: ['dist/docs/*.html', 'dist/docs/rest-api/index.html'],
+ overwrite: true,
+ replacements: [{
+ from: /<\/head>/g,
+ to: "<script>\n" +
+ "(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){\n" +
+ "(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),\n" +
+ "m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)\n" +
+ "})(window,document,'script','//www.google-analytics.com/analytics.js','ga');\n" +
+ "ga('create', 'UA-57264262-1', 'auto');\n" +
+ "ga('send', 'pageview');\n" +
+ "</script>\n" +
+ "</head>"
+ }]
+ }
+ },
watch: {
grunt: {
files: ['Gruntfile.js'],
@@ -161,11 +179,12 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-exec');
+ grunt.loadNpmTasks('grunt-text-replace');
grunt.registerTask('img', ['newer:copy']);
grunt.registerTask('css', ['clean:css', 'compass']);
grunt.registerTask('js', ['clean:js', 'concat']);
- grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated']);
+ grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics']);
grunt.registerTask('default', ['clean', 'assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']);
grunt.registerTask('dev', ['default', 'watch']);
};
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/81e40d43/nifi-site/package.json
----------------------------------------------------------------------
diff --git a/nifi-site/package.json b/nifi-site/package.json
index 92304ef..f2ad8ca 100644
--- a/nifi-site/package.json
+++ b/nifi-site/package.json
@@ -1,25 +1,28 @@
{
- "name": "apache-nifi-site",
- "version": "0.0.2-incubating",
- "description": "The artifacts for the Apache NiFi site.",
- "private": "true",
- "repository": {
- "type": "git",
- "url": "http://git-wip-us.apache.org/repos/asf/incubator-nifi.git"
- },
- "devDependencies": {
- "assemble": "^0.4.42",
- "grunt": "^0.4.5",
- "grunt-contrib-clean": "^0.6.0",
- "grunt-contrib-compass": "^1.0.1",
- "grunt-contrib-concat": "^0.5.0",
- "grunt-contrib-copy": "^0.7.0",
- "grunt-contrib-watch": "^0.6.1",
- "grunt-exec": "^0.4.6",
- "grunt-newer": "^1.1.0"
- },
- "licenses": [{
- "type": "Apache",
- "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
- }]
+ "name": "apache-nifi-site",
+ "version": "0.0.2-incubating",
+ "description": "The artifacts for the Apache NiFi site.",
+ "private": "true",
+ "repository": {
+ "type": "git",
+ "url": "http://git-wip-us.apache.org/repos/asf/incubator-nifi.git"
+ },
+ "devDependencies": {
+ "assemble": "^0.4.42",
+ "grunt": "^0.4.5",
+ "grunt-contrib-clean": "^0.6.0",
+ "grunt-contrib-compass": "^1.0.1",
+ "grunt-contrib-concat": "^0.5.0",
+ "grunt-contrib-copy": "^0.7.0",
+ "grunt-contrib-watch": "^0.6.1",
+ "grunt-exec": "^0.4.6",
+ "grunt-newer": "^1.1.0",
+ "grunt-text-replace": "^0.4.0"
+ },
+ "licenses": [
+ {
+ "type": "Apache",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+ }
+ ]
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/81e40d43/nifi-site/src/pages/html/rest-api.hbs
----------------------------------------------------------------------
diff --git a/nifi-site/src/pages/html/rest-api.hbs b/nifi-site/src/pages/html/rest-api.hbs
index 34e8fa6..7efb462 100644
--- a/nifi-site/src/pages/html/rest-api.hbs
+++ b/nifi-site/src/pages/html/rest-api.hbs
@@ -1,5 +1,5 @@
---
-title: Apache NiFi Developer Guide
+title: Apache NiFi Rest Api
---
<div class="external-guide">