http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java index 20ce740..34382b3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java @@ -24,10 +24,12 @@ import java.util.Set; import org.apache.nifi.action.Action; import org.apache.nifi.action.Component; +import org.apache.nifi.action.FlowChangeAction; import org.apache.nifi.action.Operation; -import org.apache.nifi.action.component.details.ExtensionDetails; -import org.apache.nifi.action.component.details.RemoteProcessGroupDetails; +import org.apache.nifi.action.component.details.FlowChangeExtensionDetails; +import org.apache.nifi.action.component.details.FlowChangeRemoteProcessGroupDetails; import org.apache.nifi.action.details.ConnectDetails; +import org.apache.nifi.action.details.FlowChangeConnectDetails; import org.apache.nifi.connectable.ConnectableType; import org.apache.nifi.connectable.Connection; import org.apache.nifi.connectable.Funnel; @@ -136,10 +138,10 @@ public class SnippetAuditor extends NiFiAuditor { // remote processor groups for (final RemoteProcessGroupDTO remoteProcessGroup : snippet.getRemoteProcessGroups()) { - RemoteProcessGroupDetails remoteProcessGroupDetails = new RemoteProcessGroupDetails(); + FlowChangeRemoteProcessGroupDetails remoteProcessGroupDetails = new FlowChangeRemoteProcessGroupDetails(); remoteProcessGroupDetails.setUri(remoteProcessGroup.getTargetUri()); - final Action action = generateAuditRecord(remoteProcessGroup.getId(), remoteProcessGroup.getName(), Component.RemoteProcessGroup, Operation.Add, timestamp); + final FlowChangeAction action = generateAuditRecord(remoteProcessGroup.getId(), remoteProcessGroup.getName(), Component.RemoteProcessGroup, Operation.Add, timestamp); action.setComponentDetails(remoteProcessGroupDetails); actions.add(action); } @@ -151,10 +153,10 @@ public class SnippetAuditor extends NiFiAuditor { // processors for (final ProcessorDTO processor : snippet.getProcessors()) { - final ExtensionDetails processorDetails = new ExtensionDetails(); + final FlowChangeExtensionDetails processorDetails = new FlowChangeExtensionDetails(); processorDetails.setType(StringUtils.substringAfterLast(processor.getType(), ".")); - final Action action = generateAuditRecord(processor.getId(), processor.getName(), Component.Processor, Operation.Add, timestamp); + final FlowChangeAction action = generateAuditRecord(processor.getId(), processor.getName(), Component.Processor, Operation.Add, timestamp); action.setComponentDetails(processorDetails); actions.add(action); } @@ -174,7 +176,7 @@ public class SnippetAuditor extends NiFiAuditor { final String name = StringUtils.isBlank(connection.getName()) ? relationships : connection.getName(); // create the connect details - ConnectDetails connectDetails = new ConnectDetails(); + FlowChangeConnectDetails connectDetails = new FlowChangeConnectDetails(); connectDetails.setSourceId(source.getId()); connectDetails.setSourceName(source.getName()); connectDetails.setSourceType(determineConnectableType(source)); @@ -184,7 +186,7 @@ public class SnippetAuditor extends NiFiAuditor { connectDetails.setDestinationType(determineConnectableType(destination)); // create the audit record - final Action action = generateAuditRecord(connection.getId(), name, Component.Connection, Operation.Connect, timestamp); + final FlowChangeAction action = generateAuditRecord(connection.getId(), name, Component.Connection, Operation.Connect, timestamp); action.setActionDetails(connectDetails); actions.add(action); } @@ -220,8 +222,8 @@ public class SnippetAuditor extends NiFiAuditor { /** * Generates an audit record for the creation of the specified funnel. */ - private Action generateAuditRecord(String id, String name, Component type, Operation operation, Date timestamp) { - Action action = null; + private FlowChangeAction generateAuditRecord(String id, String name, Component type, Operation operation, Date timestamp) { + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -229,8 +231,8 @@ public class SnippetAuditor extends NiFiAuditor { // ensure the user was found if (user != null) { // create the action for adding this funnel - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.setTimestamp(timestamp);
http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java index 2286213..39426c0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java @@ -37,8 +37,9 @@ import javax.ws.rs.WebApplicationException; import org.apache.nifi.action.Action; import org.apache.nifi.action.Component; +import org.apache.nifi.action.FlowChangeAction; import org.apache.nifi.action.Operation; -import org.apache.nifi.action.details.PurgeDetails; +import org.apache.nifi.action.details.FlowChangePurgeDetails; import org.apache.nifi.admin.service.AccountNotFoundException; import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.admin.service.UserService; @@ -1765,12 +1766,12 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade { } // create the purge details - PurgeDetails details = new PurgeDetails(); + FlowChangePurgeDetails details = new FlowChangePurgeDetails(); details.setEndDate(endDate); // create a purge action to record that records are being removed - Action purgeAction = new Action(); - purgeAction.setUserDn(user.getDn()); + FlowChangeAction purgeAction = new FlowChangeAction(); + purgeAction.setUserIdentity(user.getDn()); purgeAction.setUserName(user.getUserName()); purgeAction.setOperation(Operation.Purge); purgeAction.setTimestamp(new Date()); http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java index 870ba56..8e56fc2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebConfigurationContext.java @@ -34,9 +34,10 @@ import javax.ws.rs.core.Response; import org.apache.nifi.action.Action; import org.apache.nifi.action.Component; +import org.apache.nifi.action.FlowChangeAction; import org.apache.nifi.action.Operation; -import org.apache.nifi.action.component.details.ExtensionDetails; -import org.apache.nifi.action.details.ConfigureDetails; +import org.apache.nifi.action.component.details.FlowChangeExtensionDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.cluster.manager.NodeResponse; import org.apache.nifi.cluster.manager.impl.WebClusterManager; @@ -121,21 +122,21 @@ public class StandardNiFiWebConfigurationContext implements NiFiWebConfiguration final Date now = new Date(); final Collection<Action> actions = new HashSet<>(configurationActions.size()); for (final ConfigurationAction configurationAction : configurationActions) { - final ExtensionDetails extensionDetails = new ExtensionDetails(); + final FlowChangeExtensionDetails extensionDetails = new FlowChangeExtensionDetails(); extensionDetails.setType(configurationAction.getType()); - final ConfigureDetails configureDetails = new ConfigureDetails(); + final FlowChangeConfigureDetails configureDetails = new FlowChangeConfigureDetails(); configureDetails.setName(configurationAction.getName()); configureDetails.setPreviousValue(configurationAction.getPreviousValue()); configureDetails.setValue(configurationAction.getValue()); - final Action action = new Action(); + final FlowChangeAction action = new FlowChangeAction(); action.setTimestamp(now); action.setSourceId(configurationAction.getId()); action.setSourceName(configurationAction.getName()); action.setSourceType(componentType); action.setOperation(Operation.Configure); - action.setUserDn(getCurrentUserDn()); + action.setUserIdentity(getCurrentUserDn()); action.setUserName(getCurrentUserName()); action.setComponentDetails(extensionDetails); action.setActionDetails(configureDetails); http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java index 37ad804..03ce630 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiWebContext.java @@ -34,9 +34,10 @@ import javax.ws.rs.core.Response; import org.apache.nifi.action.Action; import org.apache.nifi.action.Component; +import org.apache.nifi.action.FlowChangeAction; import org.apache.nifi.action.Operation; -import org.apache.nifi.action.component.details.ExtensionDetails; -import org.apache.nifi.action.details.ConfigureDetails; +import org.apache.nifi.action.component.details.FlowChangeExtensionDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.cluster.manager.NodeResponse; import org.apache.nifi.cluster.manager.impl.WebClusterManager; @@ -94,21 +95,21 @@ public class StandardNiFiWebContext implements NiFiWebContext { final Date now = new Date(); final Collection<Action> actions = new HashSet<>(processorActions.size()); for (final ProcessorConfigurationAction processorAction : processorActions) { - final ExtensionDetails processorDetails = new ExtensionDetails(); + final FlowChangeExtensionDetails processorDetails = new FlowChangeExtensionDetails(); processorDetails.setType(processorAction.getProcessorType()); - final ConfigureDetails configureDetails = new ConfigureDetails(); + final FlowChangeConfigureDetails configureDetails = new FlowChangeConfigureDetails(); configureDetails.setName(processorAction.getName()); configureDetails.setPreviousValue(processorAction.getPreviousValue()); configureDetails.setValue(processorAction.getValue()); - final Action action = new Action(); + final FlowChangeAction action = new FlowChangeAction(); action.setTimestamp(now); action.setSourceId(processorAction.getProcessorId()); action.setSourceName(processorAction.getProcessorName()); action.setSourceType(Component.Processor); action.setOperation(Operation.Configure); - action.setUserDn(getCurrentUserDn()); + action.setUserIdentity(getCurrentUserDn()); action.setUserName(getCurrentUserName()); action.setComponentDetails(processorDetails); action.setActionDetails(configureDetails); http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.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/ApplicationResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java index aa51925..3bad5e3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ApplicationResource.java @@ -40,6 +40,7 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriBuilderException; import javax.ws.rs.core.UriInfo; import org.apache.nifi.action.Action; +import org.apache.nifi.action.FlowChangeAction; import org.apache.nifi.action.Operation; import org.apache.nifi.cluster.context.ClusterContext; import org.apache.nifi.cluster.context.ClusterContextThreadLocal; @@ -203,12 +204,12 @@ public abstract class ApplicationResource { clusterCtx.getActions().clear(); // create the batch action - Action batchAction = new Action(); + FlowChangeAction batchAction = new FlowChangeAction(); batchAction.setOperation(Operation.Batch); // copy values from prototype action batchAction.setTimestamp(prototypeAction.getTimestamp()); - batchAction.setUserDn(prototypeAction.getUserDn()); + batchAction.setUserIdentity(prototypeAction.getUserIdentity()); batchAction.setUserName(prototypeAction.getUserName()); batchAction.setSourceId(prototypeAction.getSourceId()); batchAction.setSourceName(prototypeAction.getSourceName()); http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/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 16b114e..96a67f8 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 @@ -40,10 +40,16 @@ import javax.ws.rs.WebApplicationException; import org.apache.nifi.action.Action; import org.apache.nifi.action.component.details.ComponentDetails; import org.apache.nifi.action.component.details.ExtensionDetails; +import org.apache.nifi.action.component.details.FlowChangeExtensionDetails; +import org.apache.nifi.action.component.details.FlowChangeRemoteProcessGroupDetails; import org.apache.nifi.action.component.details.RemoteProcessGroupDetails; import org.apache.nifi.action.details.ActionDetails; import org.apache.nifi.action.details.ConfigureDetails; import org.apache.nifi.action.details.ConnectDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; +import org.apache.nifi.action.details.FlowChangeConnectDetails; +import org.apache.nifi.action.details.FlowChangeMoveDetails; +import org.apache.nifi.action.details.FlowChangePurgeDetails; import org.apache.nifi.action.details.MoveDetails; import org.apache.nifi.action.details.PurgeDetails; import org.apache.nifi.annotation.documentation.CapabilityDescription; @@ -156,7 +162,7 @@ public final class DtoFactory { actionDto.setSourceName(action.getSourceName()); actionDto.setSourceType(action.getSourceType().name()); actionDto.setTimestamp(action.getTimestamp()); - actionDto.setUserDn(action.getUserDn()); + actionDto.setUserDn(action.getUserIdentity()); actionDto.setUserName(action.getUserName()); actionDto.setOperation(action.getOperation().name()); actionDto.setActionDetails(createActionDetailsDto(action.getActionDetails())); @@ -176,13 +182,13 @@ public final class DtoFactory { return null; } - if (actionDetails instanceof ConfigureDetails) { + if (actionDetails instanceof FlowChangeConfigureDetails) { final ConfigureDetailsDTO configureDetails = new ConfigureDetailsDTO(); configureDetails.setName(((ConfigureDetails) actionDetails).getName()); configureDetails.setPreviousValue(((ConfigureDetails) actionDetails).getPreviousValue()); configureDetails.setValue(((ConfigureDetails) actionDetails).getValue()); return configureDetails; - } else if (actionDetails instanceof ConnectDetails) { + } else if (actionDetails instanceof FlowChangeConnectDetails) { final ConnectDetailsDTO connectDetails = new ConnectDetailsDTO(); connectDetails.setSourceId(((ConnectDetails) actionDetails).getSourceId()); connectDetails.setSourceName(((ConnectDetails) actionDetails).getSourceName()); @@ -192,14 +198,14 @@ public final class DtoFactory { connectDetails.setDestinationName(((ConnectDetails) actionDetails).getDestinationName()); connectDetails.setDestinationType(((ConnectDetails) actionDetails).getDestinationType().toString()); return connectDetails; - } else if (actionDetails instanceof MoveDetails) { + } else if (actionDetails instanceof FlowChangeMoveDetails) { final MoveDetailsDTO moveDetails = new MoveDetailsDTO(); moveDetails.setPreviousGroup(((MoveDetails) actionDetails).getPreviousGroup()); moveDetails.setPreviousGroupId(((MoveDetails) actionDetails).getPreviousGroupId()); moveDetails.setGroup(((MoveDetails) actionDetails).getGroup()); moveDetails.setGroupId(((MoveDetails) actionDetails).getGroupId()); return moveDetails; - } else if (actionDetails instanceof PurgeDetails) { + } else if (actionDetails instanceof FlowChangePurgeDetails) { final PurgeDetailsDTO purgeDetails = new PurgeDetailsDTO(); purgeDetails.setEndDate(((PurgeDetails) actionDetails).getEndDate()); return purgeDetails; @@ -219,11 +225,11 @@ public final class DtoFactory { return null; } - if (componentDetails instanceof ExtensionDetails) { + if (componentDetails instanceof FlowChangeExtensionDetails) { final ExtensionDetailsDTO processorDetails = new ExtensionDetailsDTO(); processorDetails.setType(((ExtensionDetails) componentDetails).getType()); return processorDetails; - } else if (componentDetails instanceof RemoteProcessGroupDetails) { + } else if (componentDetails instanceof FlowChangeRemoteProcessGroupDetails) { final RemoteProcessGroupDetailsDTO remoteProcessGroupDetails = new RemoteProcessGroupDetailsDTO(); remoteProcessGroupDetails.setUri(((RemoteProcessGroupDetails) componentDetails).getUri()); return remoteProcessGroupDetails;