You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/03/13 04:02:16 UTC
[26/26] incubator-nifi git commit: NIFI-353 - Javadocs. - Cleaning up
dependencies.
NIFI-353
- Javadocs.
- Cleaning up dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e7d77fed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e7d77fed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e7d77fed
Branch: refs/heads/NIFI-353
Commit: e7d77fedbdac106803c553626050e380c8b51287
Parents: a81e1ec
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Mar 12 23:01:36 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Mar 12 23:01:36 2015 -0400
----------------------------------------------------------------------
.../nifi-web/nifi-web-content-access/pom.xml | 8 ------
.../java/org/apache/nifi/web/ContentAccess.java | 1 +
.../apache/nifi/web/ContentRequestContext.java | 26 +++++++++++++++++++-
.../apache/nifi/web/DownloadableContent.java | 17 ++++++++++++-
.../web/StandardContentViewerController.java | 2 --
5 files changed, 42 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e7d77fed/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index de2e21d..4289423 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -23,13 +23,5 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-access</artifactId>
<dependencies>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-core</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e7d77fed/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
index 84f6421..a093c59 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentAccess.java
@@ -17,6 +17,7 @@
package org.apache.nifi.web;
/**
+ * Provides access to content within NiFi.
*
* @author unattributed
*/
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e7d77fed/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentRequestContext.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentRequestContext.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentRequestContext.java
index afe9ab7..f5744ee 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentRequestContext.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/ContentRequestContext.java
@@ -17,11 +17,35 @@
package org.apache.nifi.web;
/**
- *
+ * A request for content.
*/
public interface ContentRequestContext {
+
+ /**
+ * The URI to the data.
+ *
+ * @return
+ */
String getDataUri();
+
+ /**
+ * If clustered, this is the id of the node the data resides on.
+ *
+ * @return
+ */
String getClusterNodeId();
+
+ /**
+ * The client id for the user making the request.
+ *
+ * @return
+ */
String getClientId();
+
+ /**
+ * The proxy chain for the current request, if applicable.
+ *
+ * @return
+ */
String getProxiedEntitiesChain();
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e7d77fed/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
index 1d4a7ce..a23673f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/src/main/java/org/apache/nifi/web/DownloadableContent.java
@@ -19,7 +19,7 @@ package org.apache.nifi.web;
import java.io.InputStream;
/**
- *
+ * Represents content that can be downloaded.
*/
public final class DownloadableContent {
@@ -33,14 +33,29 @@ public final class DownloadableContent {
this.content = content;
}
+ /**
+ * The filename of the content.
+ *
+ * @return
+ */
public String getFilename() {
return filename;
}
+ /**
+ * The content type of the content.
+ *
+ * @return
+ */
public String getType() {
return type;
}
+ /**
+ * The content stream.
+ *
+ * @return
+ */
public InputStream getContent() {
return content;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e7d77fed/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
index 36113ef..8bf61d6 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
@@ -32,8 +32,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.io.IOUtils;
import org.apache.nifi.web.ViewableContent.DisplayMode;
import org.codehaus.jackson.map.ObjectMapper;