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/06/22 22:43:43 UTC

[1/2] incubator-nifi git commit: NIFI-578: - Deprecating unused methods.

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop 25146a582 -> 628e63998


NIFI-578:
- Deprecating unused methods.

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

Branch: refs/heads/develop
Commit: 908ec18b59030f0b43637ca3c90654040566c99e
Parents: 979671c
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Jun 22 16:39:18 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Jun 22 16:39:18 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/nifi/provenance/lineage/LineageNode.java  | 1 +
 .../main/java/org/apache/nifi/provenance/lineage/EventNode.java    | 2 ++
 .../main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java | 1 +
 3 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/908ec18b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java
index c50cdf5..56e865f 100644
--- a/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java
+++ b/nifi/nifi-api/src/main/java/org/apache/nifi/provenance/lineage/LineageNode.java
@@ -22,6 +22,7 @@ public interface LineageNode {
      * @return the identifier of the Clustered NiFi Node that generated the
      * event
      */
+    @Deprecated
     String getClusterNodeIdentifier();
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/908ec18b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
index 12d9a4f..1f8d1dc 100644
--- a/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
+++ b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/EventNode.java
@@ -36,11 +36,13 @@ public class EventNode implements ProvenanceEventLineageNode {
         return String.valueOf(getEventIdentifier());
     }
 
+    @Deprecated
     @Override
     public String getClusterNodeIdentifier() {
         return clusterNodeIdentifier;
     }
 
+    @Deprecated
     public void setClusterNodeIdentifier(final String nodeIdentifier) {
         this.clusterNodeIdentifier = nodeIdentifier;
     }

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/908ec18b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java
index fdc7470..94e7661 100644
--- a/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java
+++ b/nifi/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/lineage/FlowFileNode.java
@@ -39,6 +39,7 @@ public class FlowFileNode implements LineageNode {
         return creationTime;
     }
 
+    @Deprecated
     @Override
     public String getClusterNodeIdentifier() {
         return clusterNodeIdentifier;


[2/2] incubator-nifi git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

Posted by mc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop


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

Branch: refs/heads/develop
Commit: 628e63998c43934432bbf02219bc20991545223e
Parents: 908ec18 25146a5
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Jun 22 16:43:25 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Jun 22 16:43:25 2015 -0400

----------------------------------------------------------------------
 nifi/nifi-assembly/pom.xml                      |  1 +
 .../src/main/resources/conf/nifi.properties     |  3 +
 .../nifi/provenance/IndexConfiguration.java     |  2 +-
 .../PersistentProvenanceRepository.java         | 90 +++++++++++++++++---
 .../provenance/RepositoryConfiguration.java     | 18 ++++
 .../nifi/provenance/StandardRecordReader.java   | 15 ++--
 .../provenance/lucene/DeleteIndexAction.java    |  6 +-
 .../nifi/provenance/lucene/DocsReader.java      |  9 +-
 .../nifi/provenance/lucene/IndexSearch.java     |  7 +-
 .../nifi/provenance/lucene/LineageQuery.java    |  6 +-
 .../provenance/serialization/RecordReaders.java | 17 +++-
 .../TestPersistentProvenanceRepository.java     | 39 ++++++++-
 .../TestStandardRecordReaderWriter.java         | 10 +--
 13 files changed, 180 insertions(+), 43 deletions(-)
----------------------------------------------------------------------