| commit | 8193a84e1f6cb11b4a8b2af21da9b5846cdedcef | [log] [tgz] |
|---|---|---|
| author | Aldrin Piri <aldrin@apache.org> | Wed May 02 11:08:46 2018 -0400 |
| committer | Aldrin Piri <aldrin@apache.org> | Thu May 10 16:03:46 2018 -0400 |
| tree | a8b44235ede3328c134c195146ac5ce63f5990e3 | |
| parent | 8f813958eb631b2b8ae8bc8eded71f166bf19c68 [diff] |
MINIFI-452 Updating MiNiFi to 1.6.0 NiFi components. This closes #123. Signed-off-by: Aldrin Piri <aldrin@apache.org>
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 Long getSchedulingPeriod(final TimeUnit timeUnit) { return 0L; } + + @Override + public String getName() { + return null; + } }
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 @@ } } + @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() {
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 @@ } @Override + public String getContainerFileStoreName(String s) { + return null; + } + + @Override public long getContainerUsableSpace(String s) throws IOException { return 0; }
diff --git a/pom.xml b/pom.xml index 6a67872..e505107 100644 --- a/pom.xml +++ b/pom.xml
@@ -98,7 +98,7 @@ <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>