You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2018/05/10 20:04:39 UTC
nifi-minifi git commit: MINIFI-452 Updating MiNiFi to 1.6.0 NiFi
components.
Repository: nifi-minifi
Updated Branches:
refs/heads/master 8f813958e -> 8193a84e1
MINIFI-452 Updating MiNiFi to 1.6.0 NiFi components.
This closes #123.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/8193a84e
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/8193a84e
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/8193a84e
Branch: refs/heads/master
Commit: 8193a84e1f6cb11b4a8b2af21da9b5846cdedcef
Parents: 8f81395
Author: Aldrin Piri <al...@apache.org>
Authored: Wed May 2 11:08:46 2018 -0400
Committer: Aldrin Piri <al...@apache.org>
Committed: Thu May 10 16:03:46 2018 -0400
----------------------------------------------------------------------
.../apache/nifi/mock/MockConfigurationContext.java | 5 +++++
.../MiNiFiPersistentProvenanceRepository.java | 15 +++++++++++++++
.../nifi/provenance/NoOpProvenanceRepository.java | 5 +++++
pom.xml | 2 +-
4 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8193a84e/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/mock/MockConfigurationContext.java
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/mock/MockConfigurationContext.java b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/mock/MockConfigurationContext.java
index c1a2a2b..f2c89c5 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/mock/MockConfigurationContext.java
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-nar-utils/src/main/java/org/apache/nifi/mock/MockConfigurationContext.java
@@ -55,4 +55,9 @@ public class MockConfigurationContext implements ConfigurationContext {
public Long getSchedulingPeriod(final TimeUnit timeUnit) {
return 0L;
}
+
+ @Override
+ public String getName() {
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8193a84e/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepository.java b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepository.java
index 3c21f48..820a3ea 100644
--- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepository.java
+++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/MiNiFiPersistentProvenanceRepository.java
@@ -2065,6 +2065,21 @@ public class MiNiFiPersistentProvenanceRepository implements ProvenanceRepositor
}
}
+ @Override
+ public String getContainerFileStoreName(final String containerName) {
+ final Map<String, File> map = configuration.getStorageDirectories();
+ final File container = map.get(containerName);
+ if (container == null) {
+ return null;
+ }
+
+ try {
+ return Files.getFileStore(container.toPath()).name();
+ } catch (IOException e) {
+ return null;
+ }
+ }
+
/* TODO: The following are items to be removed when a new ProvenanceEventRepository interface can be defined and incorporated and deal with querying/indexing that does not apply */
public static final class MethodNotSupportedException extends RuntimeException {
public MethodNotSupportedException() {
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8193a84e/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
index 09d6449..8aed447 100644
--- a/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
+++ b/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/src/main/java/org/apache/nifi/provenance/NoOpProvenanceRepository.java
@@ -138,6 +138,11 @@ public class NoOpProvenanceRepository implements ProvenanceRepository {
}
@Override
+ public String getContainerFileStoreName(String s) {
+ return null;
+ }
+
+ @Override
public long getContainerUsableSpace(String s) throws IOException {
return 0;
}
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/8193a84e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a67872..e505107 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@ limitations under the License.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2016</inceptionYear>
<org.slf4j.version>1.7.25</org.slf4j.version>
- <org.apache.nifi.version>1.5.0</org.apache.nifi.version>
+ <org.apache.nifi.version>1.6.0</org.apache.nifi.version>
<logback.version>1.2.3</logback.version>
<jetty.version>9.4.3.v20170317</jetty.version>
<jersey.version>2.26</jersey.version>