You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2020/11/16 15:46:21 UTC
[GitHub] [nifi] tlsmith109 opened a new pull request #4668: NIFI-7991 Flow Configuration History displays "annotation data not fo…
tlsmith109 opened a new pull request #4668:
URL: https://github.com/apache/nifi/pull/4668
…und/available" from "Advanced" changes
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
#### Description of PR
Enables display of annotation data in flow configuration history in meaningful way; NIFI-7991.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [ ] Does your PR title start with **NIFI-XXXX** where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically `main`)?
- [ ] Is your initial contribution a single, squashed commit? _Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not `squash` or use `--force` when pushing to allow for clean monitoring of changes._
### For code changes:
- [ ] Have you ensured that the full suite of tests is executed via `mvn -Pcontrib-check clean install` at the root `nifi` folder?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] Have you verified that the full build is successful on JDK 8?
- [ ] Have you verified that the full build is successful on JDK 11?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the `LICENSE` file, including the main `LICENSE` file under `nifi-assembly`?
- [ ] If applicable, have you updated the `NOTICE` file, including the main `NOTICE` file found under `nifi-assembly`?
- [ ] If adding new Properties, have you added `.displayName` in addition to .name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### Note:
Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] mattyb149 commented on a change in pull request #4668: NIFI-7991 Flow Configuration History displays "annotation data not fo…
Posted by GitBox <gi...@apache.org>.
mattyb149 commented on a change in pull request #4668:
URL: https://github.com/apache/nifi/pull/4668#discussion_r544549281
##########
File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
##########
@@ -400,4 +444,39 @@ private PropertyDescriptor locatePropertyDescriptor(Set<PropertyDescriptor> prop
return specDescriptor;
}
+ /**
+ * Gets Item Paths and set path and node in Map map
+ * @param nl NodeList to generate path
+ * @param path String path to ParentNode
+ * @param map Map of path to node, and node reference
+ */
+ private void getItemPaths(NodeList nl, String path, Map<String,Node> map){
+ if(nl!=null) {
+
+
+ for (int i = 0; i < nl.getLength(); i++) {
+ Node n;
+ if (( n = nl.item(i)) != null) {
+ if(n.getNodeType() == Node.ELEMENT_NODE || n.getNodeType() == Node.TEXT_NODE) {
+ if(n.hasChildNodes()){
+ if(n.getNodeType() == Node.ELEMENT_NODE) {
+ getItemPaths(n.getChildNodes(), path + ":" + n.getNodeName(), map);
+ }
+ }
+ if(!n.hasChildNodes()) {
+ map.put(path + ":" + n.getNodeName().trim()+":"+n.getNodeValue(), n);
+ }
+
+ if (n.hasAttributes()) {
+ NamedNodeMap na = n.getAttributes();
+ for (int j = 0; j < na.getLength(); j++) {
+ map.put(path + ":" + n.getNodeName() + ":" + na.item(j).getNodeName().trim()+":"+na.item(j).getNodeValue(), n);
Review comment:
I'm seeing something like this displayed:
`:#document:criteria:rules:conditions:expression:#text:${filename:equals("hello!")}`
Is that intended? I would think it would be more helpful (if possible) to have something like the Rule Name then the condition or action or whatever changed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] tlsmith109 commented on pull request #4668: NIFI-7991 Flow Configuration History displays "annotation data not fo…
Posted by GitBox <gi...@apache.org>.
tlsmith109 commented on pull request #4668:
URL: https://github.com/apache/nifi/pull/4668#issuecomment-728153419
This is a very generic modification to report differences.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] tlsmith109 commented on a change in pull request #4668: NIFI-7991 Flow Configuration History displays "annotation data not fo…
Posted by GitBox <gi...@apache.org>.
tlsmith109 commented on a change in pull request #4668:
URL: https://github.com/apache/nifi/pull/4668#discussion_r546059483
##########
File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
##########
@@ -400,4 +444,39 @@ private PropertyDescriptor locatePropertyDescriptor(Set<PropertyDescriptor> prop
return specDescriptor;
}
+ /**
+ * Gets Item Paths and set path and node in Map map
+ * @param nl NodeList to generate path
+ * @param path String path to ParentNode
+ * @param map Map of path to node, and node reference
+ */
+ private void getItemPaths(NodeList nl, String path, Map<String,Node> map){
+ if(nl!=null) {
+
+
+ for (int i = 0; i < nl.getLength(); i++) {
+ Node n;
+ if (( n = nl.item(i)) != null) {
+ if(n.getNodeType() == Node.ELEMENT_NODE || n.getNodeType() == Node.TEXT_NODE) {
+ if(n.hasChildNodes()){
+ if(n.getNodeType() == Node.ELEMENT_NODE) {
+ getItemPaths(n.getChildNodes(), path + ":" + n.getNodeName(), map);
+ }
+ }
+ if(!n.hasChildNodes()) {
+ map.put(path + ":" + n.getNodeName().trim()+":"+n.getNodeValue(), n);
+ }
+
+ if (n.hasAttributes()) {
+ NamedNodeMap na = n.getAttributes();
+ for (int j = 0; j < na.getLength(); j++) {
+ map.put(path + ":" + n.getNodeName() + ":" + na.item(j).getNodeName().trim()+":"+na.item(j).getNodeValue(), n);
Review comment:
Short answer is yes. The issue being that annotation structure varies between processor types so presentation schema would have to be carried through to view the changes in context. I do not believe the model currently supports. This approach, while not near perfect, allows viewing breadcrumbs that indicate changes negatively impacting flow.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] mattyb149 closed pull request #4668: NIFI-7991 Flow Configuration History displays "annotation data not fo…
Posted by GitBox <gi...@apache.org>.
mattyb149 closed pull request #4668:
URL: https://github.com/apache/nifi/pull/4668
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org