NIFI-986 Refactoring of action classes from nifi-user-actions to have interfaces in nifi-api, and adding getFlowChanges to EventAccess - Fixing empty java docs and adding sort by id asc to the history query - Changing userDn to userIdentity in Action and FlowChangeAction - Modifying NiFiAuditor to always save events locally, and implementing getFlowChanges for ClusteredEventAccess
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5cc2b04b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5cc2b04b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5cc2b04b Branch: refs/heads/NIFI-730 Commit: 5cc2b04b918a0a3c76c0f1d71c7a416d0dce3f39 Parents: c4f0cb1 Author: Bryan Bende <[email protected]> Authored: Fri Sep 25 13:35:57 2015 -0400 Committer: Bryan Bende <[email protected]> Committed: Thu Oct 29 16:28:36 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/nifi/action/Action.java | 50 +++++++ .../java/org/apache/nifi/action/Component.java | 34 +++++ .../java/org/apache/nifi/action/Operation.java | 37 +++++ .../component/details/ComponentDetails.java | 26 ++++ .../component/details/ExtensionDetails.java | 26 ++++ .../details/RemoteProcessGroupDetails.java | 26 ++++ .../nifi/action/details/ActionDetails.java | 26 ++++ .../nifi/action/details/ConfigureDetails.java | 30 ++++ .../nifi/action/details/ConnectDetails.java | 40 ++++++ .../apache/nifi/action/details/MoveDetails.java | 30 ++++ .../nifi/action/details/PurgeDetails.java | 28 ++++ .../org/apache/nifi/reporting/EventAccess.java | 13 ++ .../org/apache/nifi/util/MockEventAccess.java | 27 ++++ .../org/apache/nifi/admin/dao/ActionDAO.java | 12 +- .../java/org/apache/nifi/admin/dao/UserDAO.java | 3 +- .../nifi/admin/dao/impl/StandardActionDAO.java | 93 ++++++++----- .../nifi/admin/dao/impl/StandardUserDAO.java | 4 +- .../apache/nifi/admin/service/AuditService.java | 18 ++- .../admin/service/action/AddActionsAction.java | 3 +- .../service/action/PurgeActionsAction.java | 3 +- .../service/impl/StandardAuditService.java | 24 +++- .../resources/nifi-administration-context.xml | 2 +- .../manager/impl/ClusteredEventAccess.java | 21 ++- .../cluster/manager/impl/WebClusterManager.java | 2 +- .../apache/nifi/controller/FlowController.java | 136 ++++++++++--------- .../nifi/spring/FlowControllerFactoryBean.java | 8 ++ .../src/main/resources/nifi-context.xml | 1 + .../controller/StandardFlowServiceTest.java | 5 +- .../nifi-framework/nifi-user-actions/pom.xml | 7 + .../java/org/apache/nifi/action/Action.java | 121 ----------------- .../java/org/apache/nifi/action/Component.java | 34 ----- .../apache/nifi/action/FlowChangeAction.java | 130 ++++++++++++++++++ .../java/org/apache/nifi/action/Operation.java | 37 ----- .../component/details/ComponentDetails.java | 26 ---- .../component/details/ExtensionDetails.java | 34 ----- .../details/FlowChangeExtensionDetails.java | 35 +++++ .../FlowChangeRemoteProcessGroupDetails.java | 35 +++++ .../details/RemoteProcessGroupDetails.java | 34 ----- .../nifi/action/details/ActionDetails.java | 26 ---- .../nifi/action/details/ConfigureDetails.java | 52 ------- .../nifi/action/details/ConnectDetails.java | 90 ------------ .../details/FlowChangeConfigureDetails.java | 55 ++++++++ .../details/FlowChangeConnectDetails.java | 97 +++++++++++++ .../action/details/FlowChangeMoveDetails.java | 65 +++++++++ .../action/details/FlowChangePurgeDetails.java | 46 +++++++ .../apache/nifi/action/details/MoveDetails.java | 61 --------- .../nifi/action/details/PurgeDetails.java | 45 ------ .../apache/nifi/audit/ControllerAuditor.java | 27 ++-- .../nifi/audit/ControllerServiceAuditor.java | 43 +++--- .../org/apache/nifi/audit/FunnelAuditor.java | 7 +- .../java/org/apache/nifi/audit/NiFiAuditor.java | 25 ++-- .../java/org/apache/nifi/audit/PortAuditor.java | 27 ++-- .../apache/nifi/audit/ProcessGroupAuditor.java | 25 ++-- .../org/apache/nifi/audit/ProcessorAuditor.java | 25 ++-- .../apache/nifi/audit/RelationshipAuditor.java | 18 +-- .../nifi/audit/RemoteProcessGroupAuditor.java | 35 ++--- .../apache/nifi/audit/ReportingTaskAuditor.java | 25 ++-- .../org/apache/nifi/audit/SnippetAuditor.java | 26 ++-- .../nifi/web/StandardNiFiServiceFacade.java | 9 +- .../StandardNiFiWebConfigurationContext.java | 13 +- .../apache/nifi/web/StandardNiFiWebContext.java | 13 +- .../nifi/web/api/ApplicationResource.java | 5 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 20 ++- 63 files changed, 1256 insertions(+), 845 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/Action.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/Action.java b/nifi-api/src/main/java/org/apache/nifi/action/Action.java new file mode 100644 index 0000000..4ab167e --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/Action.java @@ -0,0 +1,50 @@ +/* + * 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.action; + +import org.apache.nifi.action.component.details.ComponentDetails; +import org.apache.nifi.action.details.ActionDetails; + +import java.io.Serializable; +import java.util.Date; + +/** + * An action taken on the flow by a user. + */ +public interface Action extends Serializable { + + Integer getId(); + + Date getTimestamp(); + + String getUserIdentity(); + + String getUserName(); + + String getSourceId(); + + String getSourceName(); + + Component getSourceType(); + + ComponentDetails getComponentDetails(); + + Operation getOperation(); + + ActionDetails getActionDetails(); + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/Component.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/Component.java b/nifi-api/src/main/java/org/apache/nifi/action/Component.java new file mode 100644 index 0000000..dcd23ee --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/Component.java @@ -0,0 +1,34 @@ +/* + * 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.action; + +/** + * Defines possible components for a given action. + */ +public enum Component { + + Controller, + Processor, + InputPort, + OutputPort, + ProcessGroup, + RemoteProcessGroup, + Funnel, + Connection, + ControllerService, + ReportingTask; +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/Operation.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/Operation.java b/nifi-api/src/main/java/org/apache/nifi/action/Operation.java new file mode 100644 index 0000000..d1bb43f --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/Operation.java @@ -0,0 +1,37 @@ +/* + * 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.action; + +/** + * Defines possible operations for a given action. + */ +public enum Operation { + + Add, + Remove, + Paste, + Configure, + Move, + Disconnect, + Connect, + Start, + Stop, + Enable, + Disable, + Batch, + Purge; +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java new file mode 100644 index 0000000..1eb35c1 --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java @@ -0,0 +1,26 @@ +/* + * 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.action.component.details; + +import java.io.Serializable; + +/** + * Base interface for providing component details to an Action. + */ +public interface ComponentDetails extends Serializable { + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java new file mode 100644 index 0000000..5726c1b --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java @@ -0,0 +1,26 @@ +/* + * 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.action.component.details; + +/** + * Provides details of an extension on an Action. + */ +public interface ExtensionDetails extends ComponentDetails { + + String getType(); + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java new file mode 100644 index 0000000..62f8628 --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java @@ -0,0 +1,26 @@ +/* + * 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.action.component.details; + +/** + * Provides details of a remote process group to an Action. + */ +public interface RemoteProcessGroupDetails extends ComponentDetails { + + String getUri(); + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/details/ActionDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/details/ActionDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/details/ActionDetails.java new file mode 100644 index 0000000..75ebd9d --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/details/ActionDetails.java @@ -0,0 +1,26 @@ +/* + * 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.action.details; + +import java.io.Serializable; + +/** + * Provides additional details about a given action. + */ +public interface ActionDetails extends Serializable { + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java new file mode 100644 index 0000000..ff8db40 --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java @@ -0,0 +1,30 @@ +/* + * 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.action.details; + +/** + * Provides details about a configure action. + */ +public interface ConfigureDetails extends ActionDetails { + + String getName(); + + String getPreviousValue(); + + String getValue(); + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/details/ConnectDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/details/ConnectDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/details/ConnectDetails.java new file mode 100644 index 0000000..3c8c91b --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/details/ConnectDetails.java @@ -0,0 +1,40 @@ +/* + * 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.action.details; + +import org.apache.nifi.action.Component; + +/** + * Provides details about a connect action. + */ +public interface ConnectDetails extends ActionDetails { + + String getSourceId(); + + String getSourceName(); + + Component getSourceType(); + + String getDestinationId(); + + String getDestinationName(); + + Component getDestinationType(); + + String getRelationship(); + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/details/MoveDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/details/MoveDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/details/MoveDetails.java new file mode 100644 index 0000000..0533b3b --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/details/MoveDetails.java @@ -0,0 +1,30 @@ +/* + * 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.action.details; + +/** + * Provides details about a move action. + */ +public interface MoveDetails extends ActionDetails { + String getGroup(); + + String getGroupId(); + + String getPreviousGroup(); + + String getPreviousGroupId(); +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/action/details/PurgeDetails.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/action/details/PurgeDetails.java b/nifi-api/src/main/java/org/apache/nifi/action/details/PurgeDetails.java new file mode 100644 index 0000000..57bc57e --- /dev/null +++ b/nifi-api/src/main/java/org/apache/nifi/action/details/PurgeDetails.java @@ -0,0 +1,28 @@ +/* + * 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.action.details; + +import java.util.Date; + +/** + * Provides details about a purge action. + */ +public interface PurgeDetails extends ActionDetails { + + Date getEndDate(); + +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java ---------------------------------------------------------------------- diff --git a/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java b/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java index bdc23c2..70dedfa 100644 --- a/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java +++ b/nifi-api/src/main/java/org/apache/nifi/reporting/EventAccess.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.reporting; +import org.apache.nifi.action.Action; import org.apache.nifi.controller.status.ProcessGroupStatus; import org.apache.nifi.provenance.ProvenanceEventRecord; import org.apache.nifi.provenance.ProvenanceEventRepository; @@ -46,4 +47,16 @@ public interface EventAccess { * @return the Provenance Event Repository */ ProvenanceEventRepository getProvenanceRepository(); + + /** + * Obtains flow changes starting with (and including) the given action ID. If no action + * exists with that ID, the first action to be returned will have an ID greater than + * <code>firstActionId</code>. + * + * @param firstActionId the id of the first action to obtain + * @param maxActions the maximum number of actions to obtain + * @return actions with ids greater than or equal to firstActionID, up to the max number of actions + */ + List<Action> getFlowChanges(int firstActionId, final int maxActions); + } http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java ---------------------------------------------------------------------- diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java index b5f6b11..8b3bf25 100644 --- a/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java +++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockEventAccess.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.nifi.action.Action; import org.apache.nifi.controller.status.ProcessGroupStatus; import org.apache.nifi.provenance.ProvenanceEventRecord; import org.apache.nifi.provenance.ProvenanceEventRepository; @@ -29,6 +30,7 @@ public class MockEventAccess implements EventAccess { private ProcessGroupStatus processGroupStatus; private final List<ProvenanceEventRecord> provenanceRecords = new ArrayList<>(); + private final List<Action> flowChanges = new ArrayList<>(); public void setProcessGroupStatus(final ProcessGroupStatus status) { this.processGroupStatus = status; @@ -67,4 +69,29 @@ public class MockEventAccess implements EventAccess { public ProvenanceEventRepository getProvenanceRepository() { return null; } + + @Override + public List<Action> getFlowChanges(int firstActionId, int maxActions) { + if (firstActionId < 0 || maxActions < 1) { + throw new IllegalArgumentException(); + } + + final List<Action> actions = new ArrayList<>(); + + for (final Action action : flowChanges) { + if (action.getId() >= firstActionId) { + actions.add(action); + if (actions.size() >= maxActions) { + return actions; + } + } + } + + return actions; + } + + public void addFlowChange(final Action action) { + this.flowChanges.add(action); + } + } http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java index 925dc80..335a888 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/ActionDAO.java @@ -16,14 +16,15 @@ */ package org.apache.nifi.admin.dao; -import java.util.Date; -import java.util.List; -import java.util.Map; import org.apache.nifi.action.Action; -import org.apache.nifi.history.HistoryQuery; import org.apache.nifi.history.History; +import org.apache.nifi.history.HistoryQuery; import org.apache.nifi.history.PreviousValue; +import java.util.Date; +import java.util.List; +import java.util.Map; + /** * Action data access. */ @@ -33,9 +34,10 @@ public interface ActionDAO { * Persists the specified action. * * @param action to persist + * @return the created Action with it's id * @throws DataAccessException if unable to persist */ - void createAction(Action action) throws DataAccessException; + Action createAction(Action action) throws DataAccessException; /** * Finds all actions that meet the specified criteria. http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java index 6339e5a..7e91c07 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/UserDAO.java @@ -80,8 +80,9 @@ public interface UserDAO { * Creates a new user based off the specified NiFiUser. * * @param user to create + * @return the created user with it's id */ - void createUser(NiFiUser user) throws DataAccessException; + NiFiUser createUser(NiFiUser user) throws DataAccessException; /** * Updates the specified NiFiUser. http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java index bb655eb..fe693e1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardActionDAO.java @@ -30,13 +30,20 @@ import java.util.List; import java.util.Map; 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.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.admin.RepositoryUtils; @@ -195,8 +202,8 @@ public class StandardActionDAO implements ActionDAO { } @Override - public void createAction(Action action) throws DataAccessException { - if (action.getUserDn() == null) { + public Action createAction(Action action) throws DataAccessException { + if (action.getUserIdentity() == null) { throw new IllegalArgumentException("User cannot be null."); } @@ -209,7 +216,7 @@ public class StandardActionDAO implements ActionDAO { try { // obtain a statement to insert to the action table statement = connection.prepareStatement(INSERT_ACTION, Statement.RETURN_GENERATED_KEYS); - statement.setString(1, StringUtils.left(action.getUserDn(), 255)); + statement.setString(1, StringUtils.left(action.getUserIdentity(), 255)); statement.setString(2, StringUtils.left(action.getUserName(), 100)); statement.setString(3, action.getSourceId()); statement.setString(4, StringUtils.left(action.getSourceName(), 1000)); @@ -220,10 +227,21 @@ public class StandardActionDAO implements ActionDAO { // insert the action int updateCount = statement.executeUpdate(); + final FlowChangeAction createdAction = new FlowChangeAction(); + createdAction.setUserIdentity(action.getUserIdentity()); + createdAction.setUserName(action.getUserName()); + createdAction.setSourceId(action.getSourceId()); + createdAction.setSourceName(action.getSourceName()); + createdAction.setSourceType(action.getSourceType()); + createdAction.setOperation(action.getOperation()); + createdAction.setTimestamp(action.getTimestamp()); + createdAction.setActionDetails(action.getActionDetails()); + createdAction.setComponentDetails(action.getComponentDetails()); + // get the action id rs = statement.getGeneratedKeys(); if (updateCount == 1 && rs.next()) { - action.setId(rs.getInt(1)); + createdAction.setId(rs.getInt(1)); } else { throw new DataAccessException("Unable to insert action."); } @@ -232,25 +250,26 @@ public class StandardActionDAO implements ActionDAO { statement.close(); // determine the type of component - ComponentDetails componentDetails = action.getComponentDetails(); - if (componentDetails instanceof ExtensionDetails) { - createExtensionDetails(action.getId(), (ExtensionDetails) componentDetails); - } else if (componentDetails instanceof RemoteProcessGroupDetails) { - createRemoteProcessGroupDetails(action.getId(), (RemoteProcessGroupDetails) componentDetails); + ComponentDetails componentDetails = createdAction.getComponentDetails(); + if (componentDetails instanceof FlowChangeExtensionDetails) { + createExtensionDetails(createdAction.getId(), (ExtensionDetails) componentDetails); + } else if (componentDetails instanceof FlowChangeRemoteProcessGroupDetails) { + createRemoteProcessGroupDetails(createdAction.getId(), (RemoteProcessGroupDetails) componentDetails); } // determine the type of action - ActionDetails details = action.getActionDetails(); - if (details instanceof ConnectDetails) { - createConnectDetails(action.getId(), (ConnectDetails) details); - } else if (details instanceof MoveDetails) { - createMoveDetails(action.getId(), (MoveDetails) details); - } else if (details instanceof ConfigureDetails) { - createConfigureDetails(action.getId(), (ConfigureDetails) details); - } else if (details instanceof PurgeDetails) { - createPurgeDetails(action.getId(), (PurgeDetails) details); - } - + ActionDetails details = createdAction.getActionDetails(); + if (details instanceof FlowChangeConnectDetails) { + createConnectDetails(createdAction.getId(), (ConnectDetails) details); + } else if (details instanceof FlowChangeMoveDetails) { + createMoveDetails(createdAction.getId(), (MoveDetails) details); + } else if (details instanceof FlowChangeConfigureDetails) { + createConfigureDetails(createdAction.getId(), (ConfigureDetails) details); + } else if (details instanceof FlowChangePurgeDetails) { + createPurgeDetails(createdAction.getId(), (PurgeDetails) details); + } + + return createdAction; } catch (SQLException sqle) { throw new DataAccessException(sqle); } finally { @@ -540,9 +559,9 @@ public class StandardActionDAO implements ActionDAO { final Operation operation = Operation.valueOf(rs.getString("OPERATION")); final Component component = Component.valueOf(rs.getString("SOURCE_TYPE")); - Action action = new Action(); + FlowChangeAction action = new FlowChangeAction(); action.setId(actionId); - action.setUserDn(rs.getString("USER_DN")); + action.setUserIdentity(rs.getString("USER_DN")); action.setUserName(rs.getString("USER_NAME")); action.setOperation(Operation.valueOf(rs.getString("OPERATION"))); action.setTimestamp(new Date(rs.getTimestamp("ACTION_TIMESTAMP").getTime())); @@ -597,7 +616,7 @@ public class StandardActionDAO implements ActionDAO { @Override public Action getAction(Integer actionId) throws DataAccessException { - Action action = null; + FlowChangeAction action = null; PreparedStatement statement = null; ResultSet rs = null; try { @@ -614,9 +633,9 @@ public class StandardActionDAO implements ActionDAO { Component component = Component.valueOf(rs.getString("SOURCE_TYPE")); // populate the action - action = new Action(); + action = new FlowChangeAction(); action.setId(rs.getInt("ID")); - action.setUserDn(rs.getString("USER_DN")); + action.setUserIdentity(rs.getString("USER_DN")); action.setUserName(rs.getString("USER_NAME")); action.setOperation(operation); action.setTimestamp(new Date(rs.getTimestamp("ACTION_TIMESTAMP").getTime())); @@ -664,7 +683,7 @@ public class StandardActionDAO implements ActionDAO { } private ExtensionDetails getExtensionDetails(Integer actionId) throws DataAccessException { - ExtensionDetails extensionDetails = null; + FlowChangeExtensionDetails extensionDetails = null; PreparedStatement statement = null; ResultSet rs = null; try { @@ -677,7 +696,7 @@ public class StandardActionDAO implements ActionDAO { // ensure results if (rs.next()) { - extensionDetails = new ExtensionDetails(); + extensionDetails = new FlowChangeExtensionDetails(); extensionDetails.setType(rs.getString("TYPE")); } } catch (SQLException sqle) { @@ -691,7 +710,7 @@ public class StandardActionDAO implements ActionDAO { } private RemoteProcessGroupDetails getRemoteProcessGroupDetails(Integer actionId) throws DataAccessException { - RemoteProcessGroupDetails remoteProcessGroupDetails = null; + FlowChangeRemoteProcessGroupDetails remoteProcessGroupDetails = null; PreparedStatement statement = null; ResultSet rs = null; try { @@ -704,7 +723,7 @@ public class StandardActionDAO implements ActionDAO { // ensure results if (rs.next()) { - remoteProcessGroupDetails = new RemoteProcessGroupDetails(); + remoteProcessGroupDetails = new FlowChangeRemoteProcessGroupDetails(); remoteProcessGroupDetails.setUri(rs.getString("URI")); } } catch (SQLException sqle) { @@ -718,7 +737,7 @@ public class StandardActionDAO implements ActionDAO { } private MoveDetails getMoveDetails(Integer actionId) throws DataAccessException { - MoveDetails moveDetails = null; + FlowChangeMoveDetails moveDetails = null; PreparedStatement statement = null; ResultSet rs = null; try { @@ -731,7 +750,7 @@ public class StandardActionDAO implements ActionDAO { // ensure results if (rs.next()) { - moveDetails = new MoveDetails(); + moveDetails = new FlowChangeMoveDetails(); moveDetails.setGroupId(rs.getString("GROUP_ID")); moveDetails.setGroup(rs.getString("GROUP_NAME")); moveDetails.setPreviousGroupId(rs.getString("PREVIOUS_GROUP_ID")); @@ -748,7 +767,7 @@ public class StandardActionDAO implements ActionDAO { } private ConnectDetails getConnectDetails(Integer actionId) throws DataAccessException { - ConnectDetails connectionDetails = null; + FlowChangeConnectDetails connectionDetails = null; PreparedStatement statement = null; ResultSet rs = null; try { @@ -764,7 +783,7 @@ public class StandardActionDAO implements ActionDAO { final Component sourceComponent = Component.valueOf(rs.getString("SOURCE_TYPE")); final Component destinationComponent = Component.valueOf(rs.getString("DESTINATION_TYPE")); - connectionDetails = new ConnectDetails(); + connectionDetails = new FlowChangeConnectDetails(); connectionDetails.setSourceId(rs.getString("SOURCE_ID")); connectionDetails.setSourceName(rs.getString("SOURCE_NAME")); connectionDetails.setSourceType(sourceComponent); @@ -784,7 +803,7 @@ public class StandardActionDAO implements ActionDAO { } private ConfigureDetails getConfigureDetails(Integer actionId) throws DataAccessException { - ConfigureDetails configurationDetails = null; + FlowChangeConfigureDetails configurationDetails = null; PreparedStatement statement = null; ResultSet rs = null; try { @@ -797,7 +816,7 @@ public class StandardActionDAO implements ActionDAO { // ensure results if (rs.next()) { - configurationDetails = new ConfigureDetails(); + configurationDetails = new FlowChangeConfigureDetails(); configurationDetails.setName(rs.getString("NAME")); configurationDetails.setValue(rs.getString("VALUE")); configurationDetails.setPreviousValue(rs.getString("PREVIOUS_VALUE")); @@ -813,7 +832,7 @@ public class StandardActionDAO implements ActionDAO { } private PurgeDetails getPurgeDetails(Integer actionId) throws DataAccessException { - PurgeDetails purgeDetails = null; + FlowChangePurgeDetails purgeDetails = null; PreparedStatement statement = null; ResultSet rs = null; try { @@ -826,7 +845,7 @@ public class StandardActionDAO implements ActionDAO { // ensure results if (rs.next()) { - purgeDetails = new PurgeDetails(); + purgeDetails = new FlowChangePurgeDetails(); purgeDetails.setEndDate(new Date(rs.getTimestamp("END_DATE").getTime())); } } catch (SQLException sqle) { http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java index ea7c1a1..f6a62df 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/dao/impl/StandardUserDAO.java @@ -462,7 +462,7 @@ public class StandardUserDAO implements UserDAO { } @Override - public void createUser(NiFiUser user) throws DataAccessException { + public NiFiUser createUser(NiFiUser user) throws DataAccessException { if (user.getDn() == null) { throw new IllegalArgumentException("User dn must be specified."); } @@ -493,6 +493,8 @@ public class StandardUserDAO implements UserDAO { } else { throw new DataAccessException("Unable to insert user."); } + + return user; } catch (SQLException sqle) { throw new DataAccessException(sqle); } catch (DataAccessException dae) { http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/AuditService.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/AuditService.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/AuditService.java index 680173f..e2c7f77 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/AuditService.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/AuditService.java @@ -16,14 +16,15 @@ */ package org.apache.nifi.admin.service; +import org.apache.nifi.action.Action; +import org.apache.nifi.history.History; +import org.apache.nifi.history.HistoryQuery; +import org.apache.nifi.history.PreviousValue; + import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.nifi.action.Action; -import org.apache.nifi.history.HistoryQuery; -import org.apache.nifi.history.History; -import org.apache.nifi.history.PreviousValue; /** * Allows NiFi actions to be audited. @@ -55,6 +56,15 @@ public interface AuditService { History getActions(HistoryQuery actionQuery); /** + * Get the actions starting with firstActionId, returning up to maxActions. + * + * @param firstActionId the offset + * @param maxActions the number of actions to return + * @return history of actions matching the above conditions + */ + History getActions(final int firstActionId, final int maxActions); + + /** * Get the details for the specified action id. If the action cannot be * found, null is returned. * http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java index 5a2159f..db1d8a2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/AddActionsAction.java @@ -16,12 +16,13 @@ */ package org.apache.nifi.admin.service.action; -import java.util.Collection; import org.apache.nifi.action.Action; import org.apache.nifi.admin.dao.ActionDAO; import org.apache.nifi.admin.dao.DAOFactory; import org.apache.nifi.authorization.AuthorityProvider; +import java.util.Collection; + /** * Adds the specified actions. */ http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java index b5a2883..6928e0d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/action/PurgeActionsAction.java @@ -16,12 +16,13 @@ */ package org.apache.nifi.admin.service.action; -import java.util.Date; import org.apache.nifi.action.Action; import org.apache.nifi.admin.dao.ActionDAO; import org.apache.nifi.admin.dao.DAOFactory; import org.apache.nifi.authorization.AuthorityProvider; +import java.util.Date; + /** * Purges actions up to a specified end date. */ http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java index e588841..8f37d8e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/java/org/apache/nifi/admin/service/impl/StandardAuditService.java @@ -16,12 +16,6 @@ */ package org.apache.nifi.admin.service.impl; -import java.io.IOException; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.nifi.action.Action; import org.apache.nifi.admin.dao.DataAccessException; import org.apache.nifi.admin.service.AdministrationException; @@ -40,6 +34,13 @@ import org.apache.nifi.history.PreviousValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.concurrent.locks.ReentrantReadWriteLock; + /** * */ @@ -141,6 +142,17 @@ public class StandardAuditService implements AuditService { } @Override + public History getActions(int firstActionId, int maxActions) { + final HistoryQuery query = new HistoryQuery(); + query.setOffset(firstActionId); + query.setCount(maxActions); + query.setSortOrder("asc"); + query.setSortColumn("timestamp"); + + return getActions(query); + } + + @Override public Action getAction(Integer actionId) { Transaction transaction = null; Action action = null; http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml index a36619f..8cb4b97 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml @@ -23,7 +23,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";> <!-- user authority provider --> - <bean id="authorityProvider" class="org.apache.nifi.authorization.AuthorityProviderFactoryBean" depends-on="clusterManager flowController"> + <bean id="authorityProvider" class="org.apache.nifi.authorization.AuthorityProviderFactoryBean" depends-on="clusterManager"> <property name="properties" ref="nifiProperties"/> </bean> http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java index 2015530..4c48d77 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/ClusteredEventAccess.java @@ -16,12 +16,11 @@ */ package org.apache.nifi.cluster.manager.impl; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - +import org.apache.nifi.action.Action; +import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.controller.status.ProcessGroupStatus; import org.apache.nifi.events.EventReporter; +import org.apache.nifi.history.History; import org.apache.nifi.provenance.ProvenanceEventBuilder; import org.apache.nifi.provenance.ProvenanceEventRecord; import org.apache.nifi.provenance.ProvenanceEventRepository; @@ -31,12 +30,18 @@ import org.apache.nifi.provenance.search.QuerySubmission; import org.apache.nifi.provenance.search.SearchableField; import org.apache.nifi.reporting.EventAccess; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + public class ClusteredEventAccess implements EventAccess { private final WebClusterManager clusterManager; + private final AuditService auditService; - public ClusteredEventAccess(final WebClusterManager clusterManager) { + public ClusteredEventAccess(final WebClusterManager clusterManager, final AuditService auditService) { this.clusterManager = clusterManager; + this.auditService = auditService; } @Override @@ -132,4 +137,10 @@ public class ClusteredEventAccess implements EventAccess { } }; } + + @Override + public List<Action> getFlowChanges(int firstActionId, int maxActions) { + final History history = auditService.getActions(firstActionId, maxActions); + return new ArrayList<>(history.getActions()); + } } http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java index bfeec7a..2eabe0c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java @@ -1075,7 +1075,7 @@ public class WebClusterManager implements HttpClusterManager, ProtocolHandler, C final ValidationContextFactory validationContextFactory = new StandardValidationContextFactory(this); final ReportingTaskNode taskNode = new ClusteredReportingTaskNode(task, id, processScheduler, - new ClusteredEventAccess(this), bulletinRepository, controllerServiceProvider, validationContextFactory); + new ClusteredEventAccess(this, auditService), bulletinRepository, controllerServiceProvider, validationContextFactory); taskNode.setName(task.getClass().getSimpleName()); reportingTasks.put(id, taskNode); http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index 3f815b0..135025e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@ -16,39 +16,10 @@ */ package org.apache.nifi.controller; -import static java.util.Objects.requireNonNull; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import javax.net.ssl.SSLContext; - +import com.sun.jersey.api.client.ClientHandlerException; import org.apache.commons.lang3.StringUtils; +import org.apache.nifi.action.Action; +import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.admin.service.UserService; import org.apache.nifi.annotation.lifecycle.OnAdded; import org.apache.nifi.annotation.lifecycle.OnRemoved; @@ -139,6 +110,7 @@ import org.apache.nifi.groups.ProcessGroup; import org.apache.nifi.groups.RemoteProcessGroup; import org.apache.nifi.groups.RemoteProcessGroupPortDescriptor; import org.apache.nifi.groups.StandardProcessGroup; +import org.apache.nifi.history.History; import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.logging.ControllerServiceLogObserver; import org.apache.nifi.logging.LogLevel; @@ -202,7 +174,36 @@ import org.apache.nifi.web.api.dto.status.StatusHistoryDTO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.jersey.api.client.ClientHandlerException; +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import static java.util.Objects.requireNonNull; public class FlowController implements EventAccess, ControllerServiceProvider, ReportingTaskProvider, Heartbeater, QueueProvider { @@ -243,6 +244,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R private final AtomicBoolean initialized = new AtomicBoolean(false); private final ControllerServiceProvider controllerServiceProvider; private final UserService userService; + private final AuditService auditService; private final EventDrivenWorkerQueue eventDrivenWorkerQueue; private final ComponentStatusRepository componentStatusRepository; private final long systemStartTime = System.currentTimeMillis(); // time at which the node was started @@ -342,32 +344,36 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R private static final Logger heartbeatLogger = LoggerFactory.getLogger("org.apache.nifi.cluster.heartbeat"); public static FlowController createStandaloneInstance( - final FlowFileEventRepository flowFileEventRepo, - final NiFiProperties properties, - final UserService userService, - final StringEncryptor encryptor) { + final FlowFileEventRepository flowFileEventRepo, + final NiFiProperties properties, + final UserService userService, + final AuditService auditService, + final StringEncryptor encryptor) { return new FlowController( - flowFileEventRepo, - properties, - userService, - encryptor, - /* configuredForClustering */ false, - /* NodeProtocolSender */ null); + flowFileEventRepo, + properties, + userService, + auditService, + encryptor, + /* configuredForClustering */ false, + /* NodeProtocolSender */ null); } public static FlowController createClusteredInstance( - final FlowFileEventRepository flowFileEventRepo, - final NiFiProperties properties, - final UserService userService, - final StringEncryptor encryptor, - final NodeProtocolSender protocolSender) { + final FlowFileEventRepository flowFileEventRepo, + final NiFiProperties properties, + final UserService userService, + final AuditService auditService, + final StringEncryptor encryptor, + final NodeProtocolSender protocolSender) { final FlowController flowController = new FlowController( - flowFileEventRepo, - properties, - userService, - encryptor, - /* configuredForClustering */ true, - /* NodeProtocolSender */ protocolSender); + flowFileEventRepo, + properties, + userService, + auditService, + encryptor, + /* configuredForClustering */ true, + /* NodeProtocolSender */ protocolSender); flowController.setClusterManagerRemoteSiteInfo(properties.getRemoteInputPort(), properties.isSiteToSiteSecure()); @@ -375,12 +381,13 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R } private FlowController( - final FlowFileEventRepository flowFileEventRepo, - final NiFiProperties properties, - final UserService userService, - final StringEncryptor encryptor, - final boolean configuredForClustering, - final NodeProtocolSender protocolSender) { + final FlowFileEventRepository flowFileEventRepo, + final NiFiProperties properties, + final UserService userService, + final AuditService auditService, + final StringEncryptor encryptor, + final boolean configuredForClustering, + final NodeProtocolSender protocolSender) { maxTimerDrivenThreads = new AtomicInteger(10); maxEventDrivenThreads = new AtomicInteger(5); @@ -428,6 +435,7 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R startConnectablesAfterInitialization = new ArrayList<>(); startRemoteGroupPortsAfterInitialization = new ArrayList<>(); this.userService = userService; + this.auditService = auditService; final String gracefulShutdownSecondsVal = properties.getProperty(GRACEFUL_SHUTDOWN_PERIOD); long shutdownSecs; @@ -3638,7 +3646,13 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R @Override public List<ProvenanceEventRecord> getProvenanceEvents(final long firstEventId, final int maxRecords) throws IOException { - return new ArrayList<ProvenanceEventRecord>(provenanceEventRepository.getEvents(firstEventId, maxRecords)); + return new ArrayList<>(provenanceEventRepository.getEvents(firstEventId, maxRecords)); + } + + @Override + public List<Action> getFlowChanges(final int firstActionId, final int maxActions) { + final History history = auditService.getActions(firstActionId, maxActions); + return new ArrayList<>(history.getActions()); } public void setClusterManagerRemoteSiteInfo(final Integer managerListeningPort, final Boolean commsSecure) { http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java index 6949cf9..c6c18c3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/spring/FlowControllerFactoryBean.java @@ -16,6 +16,7 @@ */ package org.apache.nifi.spring; +import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.admin.service.UserService; import org.apache.nifi.cluster.protocol.NodeProtocolSender; import org.apache.nifi.controller.FlowController; @@ -38,6 +39,7 @@ public class FlowControllerFactoryBean implements FactoryBean, ApplicationContex private FlowController flowController; private NiFiProperties properties; private UserService userService; + private AuditService auditService; private StringEncryptor encryptor; @Override @@ -57,6 +59,7 @@ public class FlowControllerFactoryBean implements FactoryBean, ApplicationContex flowFileEventRepository, properties, userService, + auditService, encryptor, nodeProtocolSender); } else { @@ -64,6 +67,7 @@ public class FlowControllerFactoryBean implements FactoryBean, ApplicationContex flowFileEventRepository, properties, userService, + auditService, encryptor); } @@ -98,4 +102,8 @@ public class FlowControllerFactoryBean implements FactoryBean, ApplicationContex public void setEncryptor(final StringEncryptor encryptor) { this.encryptor = encryptor; } + + public void setAuditService(final AuditService auditService) { + this.auditService = auditService; + } } http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/nifi-context.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/nifi-context.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/nifi-context.xml index b0cdb11..e841b24 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/nifi-context.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/nifi-context.xml @@ -37,6 +37,7 @@ <bean id="flowController" class="org.apache.nifi.spring.FlowControllerFactoryBean"> <property name="properties" ref="nifiProperties"/> <property name="userService" ref="userService" /> + <property name="auditService" ref="auditService" /> <property name="encryptor" ref="stringEncryptor" /> </bean> http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java index 7dc44da..b01b26c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/StandardFlowServiceTest.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.admin.service.UserService; import org.apache.nifi.cluster.protocol.StandardDataFlow; import org.apache.nifi.controller.repository.FlowFileEventRepository; @@ -55,6 +56,7 @@ public class StandardFlowServiceTest { private NiFiProperties properties; private FlowFileEventRepository mockFlowFileEventRepository; private UserService mockUserService; + private AuditService mockAuditService; private StringEncryptor mockEncryptor; @BeforeClass @@ -67,7 +69,8 @@ public class StandardFlowServiceTest { properties = NiFiProperties.getInstance(); mockFlowFileEventRepository = mock(FlowFileEventRepository.class); mockUserService = mock(UserService.class); - flowController = FlowController.createStandaloneInstance(mockFlowFileEventRepository, properties, mockUserService, mockEncryptor); + mockAuditService = mock(AuditService.class); + flowController = FlowController.createStandaloneInstance(mockFlowFileEventRepository, properties, mockUserService, mockAuditService, mockEncryptor); flowService = StandardFlowService.createStandaloneInstance(flowController, properties, mockEncryptor); } http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml index 644826c..e8649ed 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml @@ -21,4 +21,11 @@ <version>0.3.1-SNAPSHOT</version> </parent> <artifactId>nifi-user-actions</artifactId> + + <dependencies> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-api</artifactId> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Action.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Action.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Action.java deleted file mode 100644 index 689e852..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Action.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.action; - -import java.io.Serializable; -import org.apache.nifi.action.component.details.ComponentDetails; -import org.apache.nifi.action.details.ActionDetails; -import java.util.Date; - -/** - * - */ -public class Action implements Serializable { - - private Integer id; - private String userDn; - private String userName; - private Date timestamp; - - private String sourceId; - private String sourceName; - private Component sourceType; - private ComponentDetails componentDetails; - - private Operation operation; - private ActionDetails actionDetails; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Date getTimestamp() { - return timestamp; - } - - public void setTimestamp(Date timestamp) { - this.timestamp = timestamp; - } - - public String getUserDn() { - return userDn; - } - - public void setUserDn(String userDn) { - this.userDn = userDn; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getSourceId() { - return sourceId; - } - - public void setSourceId(String sourceId) { - this.sourceId = sourceId; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(String sourceName) { - this.sourceName = sourceName; - } - - public Component getSourceType() { - return sourceType; - } - - public void setSourceType(Component sourceType) { - this.sourceType = sourceType; - } - - public ComponentDetails getComponentDetails() { - return componentDetails; - } - - public void setComponentDetails(ComponentDetails componentDetails) { - this.componentDetails = componentDetails; - } - - public Operation getOperation() { - return operation; - } - - public void setOperation(Operation operation) { - this.operation = operation; - } - - public ActionDetails getActionDetails() { - return actionDetails; - } - - public void setActionDetails(ActionDetails actionDetails) { - this.actionDetails = actionDetails; - } -} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Component.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Component.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Component.java deleted file mode 100644 index dcd23ee..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Component.java +++ /dev/null @@ -1,34 +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.action; - -/** - * Defines possible components for a given action. - */ -public enum Component { - - Controller, - Processor, - InputPort, - OutputPort, - ProcessGroup, - RemoteProcessGroup, - Funnel, - Connection, - ControllerService, - ReportingTask; -} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/FlowChangeAction.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/FlowChangeAction.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/FlowChangeAction.java new file mode 100644 index 0000000..ad22059 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/FlowChangeAction.java @@ -0,0 +1,130 @@ +/* + * 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.action; + +import org.apache.nifi.action.component.details.ComponentDetails; +import org.apache.nifi.action.details.ActionDetails; +import java.util.Date; + +/** + * + */ +public class FlowChangeAction implements Action { + + private Integer id; + private String userIdentity; + private String userName; + private Date timestamp; + + private String sourceId; + private String sourceName; + private Component sourceType; + private ComponentDetails componentDetails; + + private Operation operation; + private ActionDetails actionDetails; + + @Override + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @Override + public Date getTimestamp() { + return timestamp; + } + + public void setTimestamp(Date timestamp) { + this.timestamp = timestamp; + } + + @Override + public String getUserIdentity() { + return userIdentity; + } + + public void setUserIdentity(String userIdentity) { + this.userIdentity = userIdentity; + } + + @Override + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + @Override + public String getSourceId() { + return sourceId; + } + + public void setSourceId(String sourceId) { + this.sourceId = sourceId; + } + + @Override + public String getSourceName() { + return sourceName; + } + + public void setSourceName(String sourceName) { + this.sourceName = sourceName; + } + + @Override + public Component getSourceType() { + return sourceType; + } + + public void setSourceType(Component sourceType) { + this.sourceType = sourceType; + } + + @Override + public ComponentDetails getComponentDetails() { + return componentDetails; + } + + public void setComponentDetails(ComponentDetails componentDetails) { + this.componentDetails = componentDetails; + } + + @Override + public Operation getOperation() { + return operation; + } + + public void setOperation(Operation operation) { + this.operation = operation; + } + + @Override + public ActionDetails getActionDetails() { + return actionDetails; + } + + public void setActionDetails(ActionDetails actionDetails) { + this.actionDetails = actionDetails; + } +} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Operation.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Operation.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Operation.java deleted file mode 100644 index d1bb43f..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/Operation.java +++ /dev/null @@ -1,37 +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.action; - -/** - * Defines possible operations for a given action. - */ -public enum Operation { - - Add, - Remove, - Paste, - Configure, - Move, - Disconnect, - Connect, - Start, - Stop, - Enable, - Disable, - Batch, - Purge; -} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java deleted file mode 100644 index c05fa37..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ComponentDetails.java +++ /dev/null @@ -1,26 +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.action.component.details; - -import java.io.Serializable; - -/** - * - */ -public abstract class ComponentDetails implements Serializable { - -} http://git-wip-us.apache.org/repos/asf/nifi/blob/5cc2b04b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java deleted file mode 100644 index 4c1f91e..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/ExtensionDetails.java +++ /dev/null @@ -1,34 +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.action.component.details; - -/** - * - */ -public class ExtensionDetails extends ComponentDetails { - - private String type; - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - -}
