Repository: nifi Updated Branches: refs/heads/master aae632560 -> ae8045d99
NIFI-2505: - Updating the user identity field in the ActionDTO. This closes #800. Signed-off-by: Bryan Bende <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ae8045d9 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ae8045d9 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ae8045d9 Branch: refs/heads/master Commit: ae8045d99bcb5edf695c96d07850282208f31e0f Parents: aae6325 Author: Matt Gilman <[email protected]> Authored: Fri Aug 5 16:35:13 2016 -0400 Committer: Bryan Bende <[email protected]> Committed: Tue Aug 9 13:07:50 2016 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/web/api/dto/action/ActionDTO.java | 14 +++++++------- .../java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/ae8045d9/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java index 1332f5c..8479d49 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/action/ActionDTO.java @@ -32,7 +32,7 @@ import java.util.Date; public class ActionDTO { private Integer id; - private String userDn; + private String userIdentity; private Date timestamp; private String sourceId; @@ -58,17 +58,17 @@ public class ActionDTO { } /** - * @return user dn who perform this action + * @return user identity who perform this action */ @ApiModelProperty( - value = "The dn of the user that performed the action." + value = "The identity of the user that performed the action." ) - public String getUserDn() { - return userDn; + public String getUserIdentity() { + return userIdentity; } - public void setUserDn(String userDn) { - this.userDn = userDn; + public void setUserIdentity(String userIdentity) { + this.userIdentity = userIdentity; } /** http://git-wip-us.apache.org/repos/asf/nifi/blob/ae8045d9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index 93afccf..9c54494 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -222,7 +222,7 @@ public final class DtoFactory { actionDto.setSourceName(action.getSourceName()); actionDto.setSourceType(action.getSourceType().name()); actionDto.setTimestamp(action.getTimestamp()); - actionDto.setUserDn(action.getUserIdentity()); + actionDto.setUserIdentity(action.getUserIdentity()); actionDto.setOperation(action.getOperation().name()); actionDto.setActionDetails(createActionDetailsDto(action.getActionDetails())); actionDto.setComponentDetails(createComponentDetailsDto(action.getComponentDetails()));
