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/FlowChangeExtensionDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/FlowChangeExtensionDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/FlowChangeExtensionDetails.java new file mode 100644 index 0000000..068ce20 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/FlowChangeExtensionDetails.java @@ -0,0 +1,35 @@ +/* + * 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 FlowChangeExtensionDetails implements ExtensionDetails { + + private String type; + + @Override + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + +}
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/FlowChangeRemoteProcessGroupDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/FlowChangeRemoteProcessGroupDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/FlowChangeRemoteProcessGroupDetails.java new file mode 100644 index 0000000..c38690e --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/FlowChangeRemoteProcessGroupDetails.java @@ -0,0 +1,35 @@ +/* + * 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 FlowChangeRemoteProcessGroupDetails implements RemoteProcessGroupDetails { + + private String uri; + + @Override + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + +} 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/RemoteProcessGroupDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.java deleted file mode 100644 index 551f70a..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/component/details/RemoteProcessGroupDetails.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 RemoteProcessGroupDetails extends ComponentDetails { - - private String uri; - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - -} 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/details/ActionDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ActionDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ActionDetails.java deleted file mode 100644 index 7c0903d..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ActionDetails.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.details; - -import java.io.Serializable; - -/** - * - */ -public abstract class ActionDetails 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/details/ConfigureDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java deleted file mode 100644 index 7e20a03..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ConfigureDetails.java +++ /dev/null @@ -1,52 +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.details; - -/** - * - */ -public class ConfigureDetails extends ActionDetails { - - private String name; - private String previousValue; - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPreviousValue() { - return previousValue; - } - - public void setPreviousValue(String previousValue) { - this.previousValue = previousValue; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - -} 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/details/ConnectDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ConnectDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ConnectDetails.java deleted file mode 100644 index 2b2ebaa..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/ConnectDetails.java +++ /dev/null @@ -1,90 +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.details; - -import org.apache.nifi.action.Component; - -/** - * - */ -public class ConnectDetails extends ActionDetails { - - private String sourceId; - private String sourceName; - private Component sourceType; - private String relationship; - private String destinationId; - private String destinationName; - private Component destinationType; - - 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 String getDestinationId() { - return destinationId; - } - - public void setDestinationId(String destinationId) { - this.destinationId = destinationId; - } - - public String getDestinationName() { - return destinationName; - } - - public void setDestinationName(String destinationName) { - this.destinationName = destinationName; - } - - public Component getDestinationType() { - return destinationType; - } - - public void setDestinationType(Component destinationType) { - this.destinationType = destinationType; - } - - public String getRelationship() { - return relationship; - } - - public void setRelationship(String relationship) { - this.relationship = relationship; - } - -} 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/details/FlowChangeConfigureDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeConfigureDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeConfigureDetails.java new file mode 100644 index 0000000..568fe71 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeConfigureDetails.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.action.details; + +/** + * + */ +public class FlowChangeConfigureDetails implements ConfigureDetails { + + private String name; + private String previousValue; + private String value; + + @Override + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String getPreviousValue() { + return previousValue; + } + + public void setPreviousValue(String previousValue) { + this.previousValue = previousValue; + } + + @Override + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + +} 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/details/FlowChangeConnectDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeConnectDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeConnectDetails.java new file mode 100644 index 0000000..6c30206 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeConnectDetails.java @@ -0,0 +1,97 @@ +/* + * 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; + +/** + * + */ +public class FlowChangeConnectDetails implements ConnectDetails { + + private String sourceId; + private String sourceName; + private Component sourceType; + private String relationship; + private String destinationId; + private String destinationName; + private Component destinationType; + + @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 String getDestinationId() { + return destinationId; + } + + public void setDestinationId(String destinationId) { + this.destinationId = destinationId; + } + + @Override + public String getDestinationName() { + return destinationName; + } + + public void setDestinationName(String destinationName) { + this.destinationName = destinationName; + } + + @Override + public Component getDestinationType() { + return destinationType; + } + + public void setDestinationType(Component destinationType) { + this.destinationType = destinationType; + } + + @Override + public String getRelationship() { + return relationship; + } + + public void setRelationship(String relationship) { + this.relationship = relationship; + } + +} 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/details/FlowChangeMoveDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeMoveDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeMoveDetails.java new file mode 100644 index 0000000..aca0e2b --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangeMoveDetails.java @@ -0,0 +1,65 @@ +/* + * 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; + +/** + * + */ +public class FlowChangeMoveDetails implements MoveDetails { + + private String previousGroupId; + private String previousGroup; + private String groupId; + private String group; + + @Override + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + @Override + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + @Override + public String getPreviousGroup() { + return previousGroup; + } + + public void setPreviousGroup(String previousGroup) { + this.previousGroup = previousGroup; + } + + @Override + public String getPreviousGroupId() { + return previousGroupId; + } + + public void setPreviousGroupId(String previousGroupId) { + this.previousGroupId = previousGroupId; + } + +} 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/details/FlowChangePurgeDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangePurgeDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangePurgeDetails.java new file mode 100644 index 0000000..bfc1d4d --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/FlowChangePurgeDetails.java @@ -0,0 +1,46 @@ +/* + * 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; + +/** + * + */ +public class FlowChangePurgeDetails implements PurgeDetails { + + private Date endDate; + + /** + * The end date for this purge action. + * + * @return date at which the purge ends + */ + @Override + public Date getEndDate() { + return endDate; + } + + /** + * Establishes the end data for this purge action + * @param endDate date at which the purge ends + */ + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + +} 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/details/MoveDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/MoveDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/MoveDetails.java deleted file mode 100644 index 7585127..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/MoveDetails.java +++ /dev/null @@ -1,61 +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.details; - -/** - * - */ -public class MoveDetails extends ActionDetails { - - private String previousGroupId; - private String previousGroup; - private String groupId; - private String group; - - public String getGroup() { - return group; - } - - public void setGroup(String group) { - this.group = group; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getPreviousGroup() { - return previousGroup; - } - - public void setPreviousGroup(String previousGroup) { - this.previousGroup = previousGroup; - } - - public String getPreviousGroupId() { - return previousGroupId; - } - - public void setPreviousGroupId(String previousGroupId) { - this.previousGroupId = previousGroupId; - } - -} 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/details/PurgeDetails.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/PurgeDetails.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/PurgeDetails.java deleted file mode 100644 index 5b54bb8..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/src/main/java/org/apache/nifi/action/details/PurgeDetails.java +++ /dev/null @@ -1,45 +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.details; - -import java.util.Date; - -/** - * - */ -public class PurgeDetails extends ActionDetails { - - private Date endDate; - - /** - * The end date for this purge action. - * - * @return date at which the purge ends - */ - public Date getEndDate() { - return endDate; - } - - /** - * Establishes the end data for this purge action - * @param endDate date at which the purge ends - */ - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - -} 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/ControllerAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java index f1e31dd..cede675 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerAuditor.java @@ -21,8 +21,9 @@ import java.util.Collection; import java.util.Date; 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.ConfigureDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.web.security.user.NiFiUserUtils; import org.apache.nifi.user.NiFiUser; import org.apache.nifi.web.controller.ControllerFacade; @@ -70,14 +71,14 @@ public class ControllerAuditor extends NiFiAuditor { Collection<Action> actions = new ArrayList<>(); // create the configuration details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Controller Name"); configDetails.setValue(name); configDetails.setPreviousValue(previousName); // create the config action - Action configAction = new Action(); - configAction.setUserDn(user.getDn()); + FlowChangeAction configAction = new FlowChangeAction(); + configAction.setUserIdentity(user.getDn()); configAction.setUserName(user.getUserName()); configAction.setOperation(Operation.Configure); configAction.setTimestamp(new Date()); @@ -123,14 +124,14 @@ public class ControllerAuditor extends NiFiAuditor { Collection<Action> actions = new ArrayList<>(); // create the configuration details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Controller Comments"); configDetails.setValue(comments); configDetails.setPreviousValue(previousComments); // create the config action - Action configAction = new Action(); - configAction.setUserDn(user.getDn()); + FlowChangeAction configAction = new FlowChangeAction(); + configAction.setUserIdentity(user.getDn()); configAction.setUserName(user.getUserName()); configAction.setOperation(Operation.Configure); configAction.setTimestamp(new Date()); @@ -176,14 +177,14 @@ public class ControllerAuditor extends NiFiAuditor { Collection<Action> actions = new ArrayList<>(); // create the configure details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Controller Max Timer Driven Thread Count"); configDetails.setValue(String.valueOf(maxTimerDrivenThreadCount)); configDetails.setPreviousValue(String.valueOf(previousMaxTimerDrivenThreadCount)); // create the config action - Action configAction = new Action(); - configAction.setUserDn(user.getDn()); + FlowChangeAction configAction = new FlowChangeAction(); + configAction.setUserIdentity(user.getDn()); configAction.setUserName(user.getUserName()); configAction.setOperation(Operation.Configure); configAction.setTimestamp(new Date()); @@ -229,14 +230,14 @@ public class ControllerAuditor extends NiFiAuditor { Collection<Action> actions = new ArrayList<>(); // create the configure details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Controller Max Event Driven Thread Count"); configDetails.setValue(String.valueOf(maxEventDrivenThreadCount)); configDetails.setPreviousValue(String.valueOf(previousMaxEventDrivenThreadCount)); // create the config action - Action configAction = new Action(); - configAction.setUserDn(user.getDn()); + FlowChangeAction configAction = new FlowChangeAction(); + configAction.setUserIdentity(user.getDn()); configAction.setUserName(user.getUserName()); configAction.setOperation(Operation.Configure); configAction.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/audit/ControllerServiceAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java index 8ca3f0e..0187ee4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ControllerServiceAuditor.java @@ -25,10 +25,11 @@ 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.FlowChangeExtensionDetails; import org.apache.nifi.action.details.ActionDetails; -import org.apache.nifi.action.details.ConfigureDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.controller.ConfiguredComponent; import org.apache.nifi.controller.ProcessorNode; @@ -121,7 +122,7 @@ public class ControllerServiceAuditor extends NiFiAuditor { Map<String, String> updatedValues = extractConfiguredPropertyValues(controllerService, controllerServiceDTO); // create the controller service details - ExtensionDetails serviceDetails = new ExtensionDetails(); + FlowChangeExtensionDetails serviceDetails = new FlowChangeExtensionDetails(); serviceDetails.setType(controllerService.getControllerServiceImplementation().getClass().getSimpleName()); // create a controller service action @@ -159,14 +160,14 @@ public class ControllerServiceAuditor extends NiFiAuditor { } } - final ConfigureDetails actionDetails = new ConfigureDetails(); + final FlowChangeConfigureDetails actionDetails = new FlowChangeConfigureDetails(); actionDetails.setName(property); actionDetails.setValue(newValue); actionDetails.setPreviousValue(oldValue); // create a configuration action - Action configurationAction = new Action(); - configurationAction.setUserDn(user.getDn()); + FlowChangeAction configurationAction = new FlowChangeAction(); + configurationAction.setUserIdentity(user.getDn()); configurationAction.setUserName(user.getUserName()); configurationAction.setOperation(operation); configurationAction.setTimestamp(actionTimestamp); @@ -185,8 +186,8 @@ public class ControllerServiceAuditor extends NiFiAuditor { // determine if the running state has changed and its not disabled if (isDisabled != updateIsDisabled) { // create a controller service action - Action serviceAction = new Action(); - serviceAction.setUserDn(user.getDn()); + FlowChangeAction serviceAction = new FlowChangeAction(); + serviceAction.setUserIdentity(user.getDn()); serviceAction.setUserName(user.getUserName()); serviceAction.setTimestamp(new Date()); serviceAction.setSourceId(controllerService.getIdentifier()); @@ -265,12 +266,12 @@ public class ControllerServiceAuditor extends NiFiAuditor { final ProcessorNode processor = ((ProcessorNode) component); // create the processor details - ExtensionDetails processorDetails = new ExtensionDetails(); + FlowChangeExtensionDetails processorDetails = new FlowChangeExtensionDetails(); processorDetails.setType(processor.getProcessor().getClass().getSimpleName()); // create a processor action - Action processorAction = new Action(); - processorAction.setUserDn(user.getDn()); + FlowChangeAction processorAction = new FlowChangeAction(); + processorAction.setUserIdentity(user.getDn()); processorAction.setUserName(user.getUserName()); processorAction.setTimestamp(new Date()); processorAction.setSourceId(processor.getIdentifier()); @@ -283,12 +284,12 @@ public class ControllerServiceAuditor extends NiFiAuditor { final ReportingTaskNode reportingTask = ((ReportingTaskNode) component); // create the reporting task details - ExtensionDetails processorDetails = new ExtensionDetails(); + FlowChangeExtensionDetails processorDetails = new FlowChangeExtensionDetails(); processorDetails.setType(reportingTask.getReportingTask().getClass().getSimpleName()); // create a reporting task action - Action reportingTaskAction = new Action(); - reportingTaskAction.setUserDn(user.getDn()); + FlowChangeAction reportingTaskAction = new FlowChangeAction(); + reportingTaskAction.setUserIdentity(user.getDn()); reportingTaskAction.setUserName(user.getUserName()); reportingTaskAction.setTimestamp(new Date()); reportingTaskAction.setSourceId(reportingTask.getIdentifier()); @@ -301,12 +302,12 @@ public class ControllerServiceAuditor extends NiFiAuditor { final ControllerServiceNode controllerService = ((ControllerServiceNode) component); // create the controller service details - ExtensionDetails serviceDetails = new ExtensionDetails(); + FlowChangeExtensionDetails serviceDetails = new FlowChangeExtensionDetails(); serviceDetails.setType(controllerService.getControllerServiceImplementation().getClass().getSimpleName()); // create a controller service action - Action serviceAction = new Action(); - serviceAction.setUserDn(user.getDn()); + FlowChangeAction serviceAction = new FlowChangeAction(); + serviceAction.setUserIdentity(user.getDn()); serviceAction.setUserName(user.getUserName()); serviceAction.setTimestamp(new Date()); serviceAction.setSourceId(controllerService.getIdentifier()); @@ -373,7 +374,7 @@ public class ControllerServiceAuditor extends NiFiAuditor { * @return action */ private Action generateAuditRecord(ControllerServiceNode controllerService, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -381,12 +382,12 @@ public class ControllerServiceAuditor extends NiFiAuditor { // ensure the user was found if (user != null) { // create the controller service details - ExtensionDetails serviceDetails = new ExtensionDetails(); + FlowChangeExtensionDetails serviceDetails = new FlowChangeExtensionDetails(); serviceDetails.setType(controllerService.getControllerServiceImplementation().getClass().getSimpleName()); // create the controller service action for adding this controller service - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.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/audit/FunnelAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java index e864c89..51cb20c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FunnelAuditor.java @@ -20,6 +20,7 @@ import java.util.Date; 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.ActionDetails; import org.apache.nifi.connectable.Funnel; @@ -111,7 +112,7 @@ public class FunnelAuditor extends NiFiAuditor { * @return action */ public Action generateAuditRecord(Funnel funnel, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -119,8 +120,8 @@ public class FunnelAuditor 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(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/audit/NiFiAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java index 4477cce..85f0b9f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/NiFiAuditor.java @@ -19,6 +19,7 @@ package org.apache.nifi.audit; import java.util.ArrayList; import java.util.Collection; import org.apache.nifi.action.Action; +import org.apache.nifi.action.details.FlowChangeMoveDetails; import org.apache.nifi.action.details.MoveDetails; import org.apache.nifi.admin.service.AuditService; import org.apache.nifi.cluster.context.ClusterContext; @@ -62,22 +63,22 @@ public abstract class NiFiAuditor { // if we're a connected node, then put audit actions on threadlocal to propagate back to manager if (ctx != null) { ctx.getActions().addAll(actions); - } else { - // if we're the cluster manager, or a disconnected node, or running standalone, then audit actions - try { - // record the operations - auditService.addActions(actions); - } catch (Throwable t) { - logger.warn("Unable to record actions: " + t.getMessage()); - if (logger.isDebugEnabled()) { - logger.warn(StringUtils.EMPTY, t); - } + } + + // always save the actions regardless of cluster or stand-alone + // all nodes in a cluster will have their own local copy without batching + try { + auditService.addActions(actions); + } catch (Throwable t) { + logger.warn("Unable to record actions: " + t.getMessage()); + if (logger.isDebugEnabled()) { + logger.warn(StringUtils.EMPTY, t); } } } protected MoveDetails createMoveDetails(String previousGroupId, String newGroupId, Logger logger) { - MoveDetails moveDetails = null; + FlowChangeMoveDetails moveDetails = null; // get the groups in question ProcessGroup previousGroup = processGroupDAO.getProcessGroup(previousGroupId); @@ -86,7 +87,7 @@ public abstract class NiFiAuditor { // ensure the groups were found if (previousGroup != null && newGroup != null) { // create the move details - moveDetails = new MoveDetails(); + moveDetails = new FlowChangeMoveDetails(); moveDetails.setPreviousGroupId(previousGroup.getIdentifier()); moveDetails.setPreviousGroup(previousGroup.getName()); moveDetails.setGroupId(newGroup.getIdentifier()); 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/PortAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java index 2df883d..b07d64f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/PortAuditor.java @@ -24,9 +24,10 @@ 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.details.ActionDetails; -import org.apache.nifi.action.details.ConfigureDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.connectable.ConnectableType; import org.apache.nifi.connectable.Port; import org.apache.nifi.controller.ScheduledState; @@ -115,7 +116,7 @@ public class PortAuditor extends NiFiAuditor { // see if the name has changed if (name != null && portDTO.getName() != null && !name.equals(updatedPort.getName())) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Name"); configDetails.setValue(updatedPort.getName()); configDetails.setPreviousValue(name); @@ -126,7 +127,7 @@ public class PortAuditor extends NiFiAuditor { // see if the comments has changed if (comments != null && portDTO.getComments() != null && !comments.equals(updatedPort.getComments())) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Comments"); configDetails.setValue(updatedPort.getComments()); configDetails.setPreviousValue(comments); @@ -138,7 +139,7 @@ public class PortAuditor extends NiFiAuditor { if (isRootGroupPort) { if (portDTO.getConcurrentlySchedulableTaskCount() != null && updatedPort.getMaxConcurrentTasks() != maxConcurrentTasks) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Concurrent Tasks"); configDetails.setValue(String.valueOf(updatedPort.getMaxConcurrentTasks())); configDetails.setPreviousValue(String.valueOf(maxConcurrentTasks)); @@ -157,7 +158,7 @@ public class PortAuditor extends NiFiAuditor { // if users were added/removed if (newUsers.size() > 0 || removedUsers.size() > 0) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("User Access Control"); configDetails.setValue(StringUtils.join(portDTO.getUserAccessControl(), ", ")); configDetails.setPreviousValue(StringUtils.join(existingUsers, ", ")); @@ -177,7 +178,7 @@ public class PortAuditor extends NiFiAuditor { // if groups were added/removed if (newGroups.size() > 0 || removedGroups.size() > 0) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Group Access Control"); configDetails.setValue(StringUtils.join(portDTO.getGroupAccessControl(), ", ")); configDetails.setPreviousValue(StringUtils.join(existingGroups, ", ")); @@ -203,8 +204,8 @@ public class PortAuditor extends NiFiAuditor { // create the actions for (ActionDetails detail : configurationDetails) { // create the port action for updating the name - Action portAction = new Action(); - portAction.setUserDn(user.getDn()); + FlowChangeAction portAction = new FlowChangeAction(); + portAction.setUserIdentity(user.getDn()); portAction.setUserName(user.getUserName()); portAction.setOperation(Operation.Configure); portAction.setTimestamp(timestamp); @@ -223,8 +224,8 @@ public class PortAuditor extends NiFiAuditor { // determine if the running state has changed if (scheduledState != updatedScheduledState) { // create a processor action - Action processorAction = new Action(); - processorAction.setUserDn(user.getDn()); + FlowChangeAction processorAction = new FlowChangeAction(); + processorAction.setUserIdentity(user.getDn()); processorAction.setUserName(user.getUserName()); processorAction.setTimestamp(new Date()); processorAction.setSourceId(updatedPort.getIdentifier()); @@ -307,7 +308,7 @@ public class PortAuditor extends NiFiAuditor { * @return action */ public Action generateAuditRecord(Port port, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -321,8 +322,8 @@ public class PortAuditor extends NiFiAuditor { } // create the port action for adding this processor - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.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/audit/ProcessGroupAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java index fa5ac70..d563555 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessGroupAuditor.java @@ -21,10 +21,11 @@ import java.util.Collection; import java.util.Date; 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.ActionDetails; -import org.apache.nifi.action.details.ConfigureDetails; -import org.apache.nifi.action.details.MoveDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; +import org.apache.nifi.action.details.FlowChangeMoveDetails; import org.apache.nifi.groups.ProcessGroup; import org.apache.nifi.web.security.user.NiFiUserUtils; import org.apache.nifi.user.NiFiUser; @@ -103,7 +104,7 @@ public class ProcessGroupAuditor extends NiFiAuditor { // see if the name has changed if (name != null && updatedProcessGroup.getName() != null && !name.equals(updatedProcessGroup.getName())) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("name"); configDetails.setValue(updatedProcessGroup.getName()); configDetails.setPreviousValue(name); @@ -114,7 +115,7 @@ public class ProcessGroupAuditor extends NiFiAuditor { // see if the comments has changed if (comments != null && updatedProcessGroup.getComments() != null && !comments.equals(updatedProcessGroup.getComments())) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("comments"); configDetails.setValue(updatedProcessGroup.getComments()); configDetails.setPreviousValue(comments); @@ -133,13 +134,13 @@ public class ProcessGroupAuditor extends NiFiAuditor { for (ActionDetails detail : details) { // determine the type of operation being performed Operation operation = Operation.Configure; - if (detail instanceof MoveDetails) { + if (detail instanceof FlowChangeMoveDetails) { operation = Operation.Move; } // create the port action for updating the name - Action processGroupAction = new Action(); - processGroupAction.setUserDn(user.getDn()); + FlowChangeAction processGroupAction = new FlowChangeAction(); + processGroupAction.setUserIdentity(user.getDn()); processGroupAction.setUserName(user.getUserName()); processGroupAction.setOperation(operation); processGroupAction.setTimestamp(timestamp); @@ -155,8 +156,8 @@ public class ProcessGroupAuditor extends NiFiAuditor { // if the user was starting/stopping this process group if (processGroupDTO.isRunning() != null) { // create a process group action - Action processGroupAction = new Action(); - processGroupAction.setUserDn(user.getDn()); + FlowChangeAction processGroupAction = new FlowChangeAction(); + processGroupAction.setUserIdentity(user.getDn()); processGroupAction.setUserName(user.getUserName()); processGroupAction.setSourceId(processGroup.getIdentifier()); processGroupAction.setSourceName(processGroup.getName()); @@ -231,7 +232,7 @@ public class ProcessGroupAuditor extends NiFiAuditor { * @return action */ public Action generateAuditRecord(ProcessGroup processGroup, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -240,8 +241,8 @@ public class ProcessGroupAuditor extends NiFiAuditor { if (user != null) { // create the process group action for adding this process group - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.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/audit/ProcessorAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java index 23df486..b8a2c69 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java @@ -29,10 +29,11 @@ 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.FlowChangeExtensionDetails; import org.apache.nifi.action.details.ActionDetails; -import org.apache.nifi.action.details.ConfigureDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.controller.ProcessorNode; import org.apache.nifi.controller.ScheduledState; @@ -131,7 +132,7 @@ public class ProcessorAuditor extends NiFiAuditor { Map<String, String> updatedValues = extractConfiguredPropertyValues(processor, processorDTO); // create the processor details - ExtensionDetails processorDetails = new ExtensionDetails(); + FlowChangeExtensionDetails processorDetails = new FlowChangeExtensionDetails(); processorDetails.setType(processor.getProcessor().getClass().getSimpleName()); // create a processor action @@ -169,14 +170,14 @@ public class ProcessorAuditor extends NiFiAuditor { } } - final ConfigureDetails actionDetails = new ConfigureDetails(); + final FlowChangeConfigureDetails actionDetails = new FlowChangeConfigureDetails(); actionDetails.setName(property); actionDetails.setValue(newValue); actionDetails.setPreviousValue(oldValue); // create a configuration action - Action configurationAction = new Action(); - configurationAction.setUserDn(user.getDn()); + FlowChangeAction configurationAction = new FlowChangeAction(); + configurationAction.setUserIdentity(user.getDn()); configurationAction.setUserName(user.getUserName()); configurationAction.setOperation(operation); configurationAction.setTimestamp(actionTimestamp); @@ -195,8 +196,8 @@ public class ProcessorAuditor extends NiFiAuditor { // determine if the running state has changed and its not disabled if (scheduledState != updatedScheduledState) { // create a processor action - Action processorAction = new Action(); - processorAction.setUserDn(user.getDn()); + FlowChangeAction processorAction = new FlowChangeAction(); + processorAction.setUserIdentity(user.getDn()); processorAction.setUserName(user.getUserName()); processorAction.setTimestamp(new Date()); processorAction.setSourceId(processor.getIdentifier()); @@ -280,7 +281,7 @@ public class ProcessorAuditor extends NiFiAuditor { * @return action */ public Action generateAuditRecord(ProcessorNode processor, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -288,12 +289,12 @@ public class ProcessorAuditor extends NiFiAuditor { // ensure the user was found if (user != null) { // create the processor details - ExtensionDetails processorDetails = new ExtensionDetails(); + FlowChangeExtensionDetails processorDetails = new FlowChangeExtensionDetails(); processorDetails.setType(processor.getProcessor().getClass().getSimpleName()); // create the processor action for adding this processor - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.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/audit/RelationshipAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java index c55a1c6..f90d572 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RelationshipAuditor.java @@ -26,10 +26,12 @@ 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.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.connectable.Connectable; import org.apache.nifi.connectable.Connection; import org.apache.nifi.connectable.Funnel; @@ -179,14 +181,14 @@ public class RelationshipAuditor extends NiFiAuditor { // ensure the value is changing if (oldValue == null || newValue == null || !newValue.equals(oldValue)) { // create the config details - ConfigureDetails configurationDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configurationDetails = new FlowChangeConfigureDetails(); configurationDetails.setName(property); configurationDetails.setValue(newValue); configurationDetails.setPreviousValue(oldValue); // create a configuration action - Action configurationAction = new Action(); - configurationAction.setUserDn(user.getDn()); + FlowChangeAction configurationAction = new FlowChangeAction(); + configurationAction.setUserIdentity(user.getDn()); configurationAction.setUserName(user.getUserName()); configurationAction.setOperation(Operation.Configure); configurationAction.setTimestamp(actionTimestamp); @@ -263,7 +265,7 @@ public class RelationshipAuditor extends NiFiAuditor { final String formattedRelationships = relationshipNames.isEmpty() ? StringUtils.EMPTY : StringUtils.join(relationshipNames, ", "); // create the connect details - final ConnectDetails connectDetails = new ConnectDetails(); + final FlowChangeConnectDetails connectDetails = new FlowChangeConnectDetails(); connectDetails.setSourceId(source.getIdentifier()); connectDetails.setSourceName(source.getName()); connectDetails.setSourceType(sourceType); @@ -327,7 +329,7 @@ public class RelationshipAuditor extends NiFiAuditor { * @return action */ public Action generateAuditRecordForConnection(Connection connection, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -350,8 +352,8 @@ public class RelationshipAuditor extends NiFiAuditor { Date actionTimestamp = new Date(); // create a new relationship action - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.setTimestamp(actionTimestamp); 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/RemoteProcessGroupAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java index f201fe2..e145a62 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/RemoteProcessGroupAuditor.java @@ -23,10 +23,11 @@ import java.util.HashMap; 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.RemoteProcessGroupDetails; +import org.apache.nifi.action.component.details.FlowChangeRemoteProcessGroupDetails; import org.apache.nifi.action.details.ActionDetails; -import org.apache.nifi.action.details.ConfigureDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.groups.RemoteProcessGroup; import org.apache.nifi.remote.RemoteGroupPort; import org.apache.nifi.web.security.user.NiFiUserUtils; @@ -123,7 +124,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { // see if the communications timeout has changed if (remoteProcessGroupDTO.getCommunicationsTimeout() != null && !updatedRemoteProcessGroup.getCommunicationsTimeout().equals(communicationsTimeout)) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Communications Timeout"); configDetails.setValue(updatedRemoteProcessGroup.getCommunicationsTimeout()); configDetails.setPreviousValue(communicationsTimeout); @@ -134,7 +135,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { // see if the yield duration has changed if (remoteProcessGroupDTO.getYieldDuration() != null && !updatedRemoteProcessGroup.getYieldDuration().equals(yieldDuration)) { // create the config details - ConfigureDetails configDetails = new ConfigureDetails(); + FlowChangeConfigureDetails configDetails = new FlowChangeConfigureDetails(); configDetails.setName("Yield Duration"); configDetails.setValue(updatedRemoteProcessGroup.getYieldDuration()); configDetails.setPreviousValue(yieldDuration); @@ -162,7 +163,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { final Integer previousConcurrentTasks = concurrentTasks.get(remotePortDTO.getId()); if (previousConcurrentTasks != null && remotePort.getMaxConcurrentTasks() != previousConcurrentTasks) { // create the config details - ConfigureDetails concurrentTasksDetails = new ConfigureDetails(); + FlowChangeConfigureDetails concurrentTasksDetails = new FlowChangeConfigureDetails(); concurrentTasksDetails.setName("Concurrent Tasks"); concurrentTasksDetails.setValue(String.valueOf(remotePort.getMaxConcurrentTasks())); concurrentTasksDetails.setPreviousValue(String.valueOf(previousConcurrentTasks)); @@ -177,7 +178,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { final Boolean previousCompression = compression.get(remotePortDTO.getId()); if (previousCompression != null && remotePort.isUseCompression() != previousCompression) { // create the config details - ConfigureDetails compressionDetails = new ConfigureDetails(); + FlowChangeConfigureDetails compressionDetails = new FlowChangeConfigureDetails(); compressionDetails.setName("Compressed"); compressionDetails.setValue(String.valueOf(remotePort.isUseCompression())); compressionDetails.setPreviousValue(String.valueOf(previousCompression)); @@ -204,7 +205,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { final Integer previousConcurrentTasks = concurrentTasks.get(remotePortDTO.getId()); if (previousConcurrentTasks != null && remotePort.getMaxConcurrentTasks() != previousConcurrentTasks) { // create the config details - ConfigureDetails concurrentTasksDetails = new ConfigureDetails(); + FlowChangeConfigureDetails concurrentTasksDetails = new FlowChangeConfigureDetails(); concurrentTasksDetails.setName("Concurrent Tasks"); concurrentTasksDetails.setValue(String.valueOf(remotePort.getMaxConcurrentTasks())); concurrentTasksDetails.setPreviousValue(String.valueOf(previousConcurrentTasks)); @@ -219,7 +220,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { final Boolean previousCompression = compression.get(remotePortDTO.getId()); if (previousCompression != null && remotePort.isUseCompression() != previousCompression) { // create the config details - ConfigureDetails compressionDetails = new ConfigureDetails(); + FlowChangeConfigureDetails compressionDetails = new FlowChangeConfigureDetails(); compressionDetails.setName("Compressed"); compressionDetails.setValue(String.valueOf(remotePort.isUseCompression())); compressionDetails.setPreviousValue(String.valueOf(previousCompression)); @@ -234,7 +235,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { Collection<Action> actions = new ArrayList<>(); // create the remote process group details - RemoteProcessGroupDetails remoteProcessGroupDetails = new RemoteProcessGroupDetails(); + FlowChangeRemoteProcessGroupDetails remoteProcessGroupDetails = new FlowChangeRemoteProcessGroupDetails(); remoteProcessGroupDetails.setUri(remoteProcessGroup.getTargetUri().toString()); // save the actions if necessary @@ -244,8 +245,8 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { // create the actions for (ActionDetails detail : details) { // create the port action for updating the name - Action remoteProcessGroupAction = new Action(); - remoteProcessGroupAction.setUserDn(user.getDn()); + FlowChangeAction remoteProcessGroupAction = new FlowChangeAction(); + remoteProcessGroupAction.setUserIdentity(user.getDn()); remoteProcessGroupAction.setUserName(user.getUserName()); remoteProcessGroupAction.setOperation(Operation.Configure); remoteProcessGroupAction.setTimestamp(timestamp); @@ -265,8 +266,8 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { // determine if the running state has changed if (transmissionState != updatedTransmissionState) { // create a processor action - Action remoteProcessGroupAction = new Action(); - remoteProcessGroupAction.setUserDn(user.getDn()); + FlowChangeAction remoteProcessGroupAction = new FlowChangeAction(); + remoteProcessGroupAction.setUserIdentity(user.getDn()); remoteProcessGroupAction.setUserName(user.getUserName()); remoteProcessGroupAction.setTimestamp(new Date()); remoteProcessGroupAction.setSourceId(updatedRemoteProcessGroup.getIdentifier()); @@ -342,7 +343,7 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { * @return action */ public Action generateAuditRecord(RemoteProcessGroup remoteProcessGroup, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -350,12 +351,12 @@ public class RemoteProcessGroupAuditor extends NiFiAuditor { // ensure the user was found if (user != null) { // create the remote process group details - RemoteProcessGroupDetails remoteProcessGroupDetails = new RemoteProcessGroupDetails(); + FlowChangeRemoteProcessGroupDetails remoteProcessGroupDetails = new FlowChangeRemoteProcessGroupDetails(); remoteProcessGroupDetails.setUri(remoteProcessGroup.getTargetUri().toString()); // create the remote process group action - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.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/audit/ReportingTaskAuditor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java index bad91ec..712f99a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ReportingTaskAuditor.java @@ -25,10 +25,11 @@ 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.FlowChangeExtensionDetails; import org.apache.nifi.action.details.ActionDetails; -import org.apache.nifi.action.details.ConfigureDetails; +import org.apache.nifi.action.details.FlowChangeConfigureDetails; import org.apache.nifi.components.PropertyDescriptor; import org.apache.nifi.controller.ReportingTaskNode; import org.apache.nifi.controller.ScheduledState; @@ -114,7 +115,7 @@ public class ReportingTaskAuditor extends NiFiAuditor { Map<String, String> updatedValues = extractConfiguredPropertyValues(reportingTask, reportingTaskDTO); // create the reporting task details - ExtensionDetails taskDetails = new ExtensionDetails(); + FlowChangeExtensionDetails taskDetails = new FlowChangeExtensionDetails(); taskDetails.setType(reportingTask.getReportingTask().getClass().getSimpleName()); // create a reporting task action @@ -152,14 +153,14 @@ public class ReportingTaskAuditor extends NiFiAuditor { } } - final ConfigureDetails actionDetails = new ConfigureDetails(); + final FlowChangeConfigureDetails actionDetails = new FlowChangeConfigureDetails(); actionDetails.setName(property); actionDetails.setValue(newValue); actionDetails.setPreviousValue(oldValue); // create a configuration action - Action configurationAction = new Action(); - configurationAction.setUserDn(user.getDn()); + FlowChangeAction configurationAction = new FlowChangeAction(); + configurationAction.setUserIdentity(user.getDn()); configurationAction.setUserName(user.getUserName()); configurationAction.setOperation(operation); configurationAction.setTimestamp(actionTimestamp); @@ -178,8 +179,8 @@ public class ReportingTaskAuditor extends NiFiAuditor { // determine if the running state has changed and its not disabled if (scheduledState != updatedScheduledState) { // create a reporting task action - Action taskAction = new Action(); - taskAction.setUserDn(user.getDn()); + FlowChangeAction taskAction = new FlowChangeAction(); + taskAction.setUserIdentity(user.getDn()); taskAction.setUserName(user.getUserName()); taskAction.setTimestamp(new Date()); taskAction.setSourceId(reportingTask.getIdentifier()); @@ -262,7 +263,7 @@ public class ReportingTaskAuditor extends NiFiAuditor { * @return action */ public Action generateAuditRecord(ReportingTaskNode reportingTask, Operation operation, ActionDetails actionDetails) { - Action action = null; + FlowChangeAction action = null; // get the current user NiFiUser user = NiFiUserUtils.getNiFiUser(); @@ -270,12 +271,12 @@ public class ReportingTaskAuditor extends NiFiAuditor { // ensure the user was found if (user != null) { // create the reporting task details - ExtensionDetails taskDetails = new ExtensionDetails(); + FlowChangeExtensionDetails taskDetails = new FlowChangeExtensionDetails(); taskDetails.setType(reportingTask.getReportingTask().getClass().getSimpleName()); // create the reporting task action for adding this reporting task - action = new Action(); - action.setUserDn(user.getDn()); + action = new FlowChangeAction(); + action.setUserIdentity(user.getDn()); action.setUserName(user.getUserName()); action.setOperation(operation); action.setTimestamp(new Date());