Repository: nifi
Updated Branches:
  refs/heads/master 978f483ba -> 2f3017638


NIFI-3239:
- Indicating components are not restricted when appropriate.
- Updating unit tests.

This closes #1350.

Signed-off-by: Aldrin Piri <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2f301763
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2f301763
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2f301763

Branch: refs/heads/master
Commit: 2f3017638f39fb6f30ccecc56aad04d31a7ab68f
Parents: 978f483
Author: Matt Gilman <[email protected]>
Authored: Wed Dec 21 15:51:00 2016 -0500
Committer: Aldrin Piri <[email protected]>
Committed: Tue Dec 27 13:06:07 2016 -0500

----------------------------------------------------------------------
 .../nifi/documentation/html/HtmlDocumentationWriter.java       | 6 ++++--
 .../documentation/html/ProcessorDocumentationWriterTest.java   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/2f301763/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
index 9a60c27..974e3eb 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
@@ -162,7 +162,7 @@ public class HtmlDocumentationWriter implements 
DocumentationWriter {
 
             xmlStreamWriter.writeEndElement();
         } else {
-            xmlStreamWriter.writeCharacters("This processor has no state 
management.");
+            xmlStreamWriter.writeCharacters("This component does not store 
state.");
         }
     }
 
@@ -180,7 +180,9 @@ public class HtmlDocumentationWriter implements 
DocumentationWriter {
         writeSimpleElement(xmlStreamWriter, "h3", "Restricted: ");
 
         if(restricted != null) {
-            writeSimpleElement(xmlStreamWriter, "td", restricted.value());
+            xmlStreamWriter.writeCharacters(restricted.value());
+        } else {
+            xmlStreamWriter.writeCharacters("This component is not 
restricted.");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/2f301763/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java
index 61045b0..cf30fbc 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/ProcessorDocumentationWriterTest.java
@@ -116,8 +116,10 @@ public class ProcessorDocumentationWriterTest {
         assertContains(results, "This processor has no relationships.");
 
         // state management
-        assertContains(results, "This processor has no state management.");
+        assertContains(results, "This component does not store state.");
 
+        // state management
+        assertContains(results, "This component is not restricted.");
     }
 
     @Test

Reply via email to