You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/08/12 16:01:40 UTC
[1/6] nifi git commit: Merge pull request #5 from apache/develop
Repository: nifi
Updated Branches:
refs/heads/develop c2c513e51 -> bbacc3d8c
Merge pull request #5 from apache/develop
Merging latest Apache NiFi develop branch
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e5444aa3
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e5444aa3
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e5444aa3
Branch: refs/heads/develop
Commit: e5444aa3cf6ca941827a3110195424c73cf445f4
Parents: 3045a52 c4c98fc
Author: Brian Ghigiarelli <br...@gmail.com>
Authored: Mon Jun 22 09:21:58 2015 -0400
Committer: Brian Ghigiarelli <br...@gmail.com>
Committed: Mon Jun 22 09:21:58 2015 -0400
----------------------------------------------------------------------
.../language/antlr/AttributeExpressionLexer.g | 1 +
.../language/antlr/AttributeExpressionParser.g | 3 +-
.../attribute/expression/language/Query.java | 255 ++++++++++++-------
.../language/evaluation/BooleanEvaluator.java | 11 +
.../language/evaluation/DateEvaluator.java | 11 +
.../language/evaluation/Evaluator.java | 12 +
.../language/evaluation/NumberEvaluator.java | 10 +
.../language/evaluation/StringEvaluator.java | 11 +
.../evaluation/functions/AndEvaluator.java | 6 +-
.../evaluation/functions/AppendEvaluator.java | 6 +-
.../functions/AttributeEvaluator.java | 4 +-
.../evaluation/functions/ContainsEvaluator.java | 7 +-
.../evaluation/functions/DivideEvaluator.java | 6 +-
.../evaluation/functions/EndsWithEvaluator.java | 7 +-
.../evaluation/functions/FindEvaluator.java | 7 +-
.../evaluation/functions/FormatEvaluator.java | 4 +-
.../functions/GreaterThanEvaluator.java | 7 +-
.../functions/GreaterThanOrEqualEvaluator.java | 7 +-
.../evaluation/functions/IndexOfEvaluator.java | 7 +-
.../functions/LastIndexOfEvaluator.java | 7 +-
.../evaluation/functions/LengthEvaluator.java | 7 +-
.../evaluation/functions/LessThanEvaluator.java | 7 +-
.../functions/LessThanOrEqualEvaluator.java | 7 +-
.../evaluation/functions/MatchesEvaluator.java | 7 +-
.../evaluation/functions/MinusEvaluator.java | 6 +-
.../evaluation/functions/ModEvaluator.java | 6 +-
.../evaluation/functions/MultiplyEvaluator.java | 6 +-
.../evaluation/functions/NotEvaluator.java | 4 +-
.../functions/NumberToDateEvaluator.java | 5 +-
.../evaluation/functions/OrEvaluator.java | 6 +-
.../evaluation/functions/PlusEvaluator.java | 6 +-
.../evaluation/functions/PrependEvaluator.java | 6 +-
.../functions/ReplaceAllEvaluator.java | 8 +-
.../functions/ReplaceEmptyEvaluator.java | 6 +-
.../evaluation/functions/ReplaceEvaluator.java | 8 +-
.../functions/ReplaceNullEvaluator.java | 6 +-
.../functions/StartsWithEvaluator.java | 7 +-
.../functions/StringToDateEvaluator.java | 7 +-
.../functions/SubstringAfterEvaluator.java | 6 +-
.../functions/SubstringAfterLastEvaluator.java | 6 +-
.../functions/SubstringBeforeEvaluator.java | 6 +-
.../functions/SubstringBeforeLastEvaluator.java | 6 +-
.../functions/SubstringEvaluator.java | 11 +-
.../evaluation/functions/ToLowerEvaluator.java | 6 +-
.../evaluation/functions/ToNumberEvaluator.java | 7 +-
.../evaluation/functions/ToRadixEvaluator.java | 11 +-
.../evaluation/functions/ToUpperEvaluator.java | 6 +-
.../evaluation/functions/TrimEvaluator.java | 4 +-
.../functions/UrlDecodeEvaluator.java | 6 +-
.../functions/UrlEncodeEvaluator.java | 6 +-
.../evaluation/literals/ToLiteralEvaluator.java | 43 ++++
.../evaluation/reduce/JoinEvaluator.java | 6 +-
.../selection/AllAttributesEvaluator.java | 7 +-
.../selection/AnyAttributeEvaluator.java | 7 +-
.../AnyMatchingAttributeEvaluator.java | 21 --
.../selection/DelineatedAttributeEvaluator.java | 12 +-
.../selection/IteratingEvaluator.java | 33 +++
.../evaluation/selection/MappingEvaluator.java | 11 +-
.../selection/MultiAttributeEvaluator.java | 3 +-
.../selection/MultiMatchAttributeEvaluator.java | 5 +
.../selection/MultiNamedAttributeEvaluator.java | 5 +
.../expression/language/TestQuery.java | 54 +++-
.../asciidoc/expression-language-guide.adoc | 26 +-
.../nifi/processors/standard/EvaluateXPath.java | 2 +-
.../nifi/processors/standard/GetHTTP.java | 17 +-
65 files changed, 548 insertions(+), 289 deletions(-)
----------------------------------------------------------------------
[2/6] nifi git commit: Merge remote-tracking branch 'apache/develop'
into develop
Posted by ma...@apache.org.
Merge remote-tracking branch 'apache/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/97f33d5c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/97f33d5c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/97f33d5c
Branch: refs/heads/develop
Commit: 97f33d5c51dfd5178c10ad88fb3701f363ae39a4
Parents: e5444aa f58972e
Author: Brian Ghigiarelli <br...@gmail.com>
Authored: Fri Jun 26 11:21:49 2015 -0400
Committer: Brian Ghigiarelli <br...@gmail.com>
Committed: Fri Jun 26 11:21:49 2015 -0400
----------------------------------------------------------------------
.../nifi/provenance/lineage/LineageNode.java | 1 +
nifi/nifi-assembly/pom.xml | 1 +
.../nifi/provenance/lineage/EventNode.java | 2 +
.../nifi/provenance/lineage/FlowFileNode.java | 1 +
.../org/apache/nifi/util/NiFiProperties.java | 22 +-
.../src/main/asciidoc/administration-guide.adoc | 2 +-
.../nifi/util/MockConfigurationContext.java | 18 +-
.../nifi/util/StandardProcessorTestRunner.java | 12 +-
.../java/org/apache/nifi/util/TestRunner.java | 45 +++
.../CurrentTestStandardProcessorTestRunner.java | 71 +++++
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 15 +-
.../repository/StandardProcessSession.java | 2 +-
.../repository/StandardProvenanceReporter.java | 8 +-
.../src/main/resources/bin/nifi.sh | 4 +
.../src/main/resources/conf/nifi.properties | 3 +
.../nifi-web-ui/src/main/webapp/css/main.css | 1 +
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 2 +-
.../js/nf/canvas/nf-controller-service.js | 4 +-
.../src/main/webapp/js/nf/nf-common.js | 17 ++
.../apache/nifi/processors/kafka/PutKafka.java | 301 ++++++++++++++-----
.../nifi/processors/kafka/TestPutKafka.java | 163 ++++++++++
.../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 +-
.../nifi/processors/standard/ExtractText.java | 4 +-
.../nifi/processors/standard/MergeContent.java | 57 ++--
34 files changed, 795 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
[3/6] nifi git commit: Merge pull request #6 from apache/develop
Posted by ma...@apache.org.
Merge pull request #6 from apache/develop
Merging in latest Apache NiFi develop branch
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a1af29ec
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a1af29ec
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a1af29ec
Branch: refs/heads/develop
Commit: a1af29eca06fa56903ca2fa28945a0f922d6e8e9
Parents: 97f33d5 cafddb6
Author: Brian Ghigiarelli <br...@gmail.com>
Authored: Thu Jul 23 21:43:06 2015 -0400
Committer: Brian Ghigiarelli <br...@gmail.com>
Committed: Thu Jul 23 21:43:06 2015 -0400
----------------------------------------------------------------------
README.md | 28 +-
nifi-nar-maven-plugin/pom.xml | 6 +-
nifi-parent/pom.xml | 39 ++-
nifi-site/Gruntfile.js | 4 +-
nifi-site/README.md | 6 +-
nifi-site/bower.json | 4 +-
nifi-site/package.json | 4 +-
nifi-site/src/images/egg-logo.png | Bin 8626 -> 0 bytes
nifi-site/src/includes/disclaimer.hbs | 20 +-
nifi-site/src/includes/topbar.hbs | 5 +-
nifi-site/src/pages/html/download.hbs | 44 +--
nifi-site/src/pages/html/mailing_lists.hbs | 26 +-
nifi-site/src/pages/html/people.hbs | 53 +--
nifi-site/src/pages/markdown/licensing-guide.md | 5 +-
nifi-site/src/pages/markdown/quickstart.md | 61 +++-
nifi-site/src/pages/markdown/release-guide.md | 147 +++-----
nifi/DISCLAIMER | 15 -
nifi/README.md | 32 +-
nifi/nifi-api/pom.xml | 2 +-
.../nifi/annotation/lifecycle/OnDisabled.java | 10 +-
.../nifi/controller/ConfigurationContext.java | 23 +-
.../org/apache/nifi/events/EventReporter.java | 4 +-
.../org/apache/nifi/reporting/Bulletin.java | 11 +-
.../apache/nifi/reporting/BulletinQuery.java | 12 +
.../apache/nifi/reporting/ComponentType.java | 58 ++++
nifi/nifi-assembly/NOTICE | 86 +++++
nifi/nifi-assembly/README.md | 20 +-
nifi/nifi-assembly/pom.xml | 33 +-
.../src/main/assembly/dependencies.xml | 23 +-
nifi/nifi-bootstrap/pom.xml | 2 +-
.../java/org/apache/nifi/bootstrap/RunNiFi.java | 14 +-
.../nifi-data-provenance-utils/pom.xml | 2 +-
.../nifi-expression-language/pom.xml | 2 +-
.../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +-
.../nifi-hl7-query-language/pom.xml | 2 +-
nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +-
.../nifi-processor-utilities/pom.xml | 2 +-
nifi/nifi-commons/nifi-properties/pom.xml | 2 +-
nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +-
.../nifi-site-to-site-client/pom.xml | 4 +-
.../apache/nifi/remote/client/KeystoreType.java | 24 ++
.../nifi/remote/client/SiteToSiteClient.java | 257 +++++++++++++-
.../remote/client/SiteToSiteClientConfig.java | 32 +-
nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-utils/pom.xml | 4 +-
.../nifi/stream/io/ByteCountingInputStream.java | 1 +
.../org/apache/nifi/util/file/FileUtils.java | 27 +-
.../stream/io/ByteCountingInputStreamTest.java | 55 +++
nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +-
nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +-
nifi/nifi-commons/pom.xml | 2 +-
nifi/nifi-docs/pom.xml | 2 +-
.../src/main/asciidoc/administration-guide.adoc | 4 +-
.../src/main/asciidoc/developer-guide.adoc | 10 +-
.../asciidoc/expression-language-guide.adoc | 12 +-
nifi/nifi-docs/src/main/asciidoc/overview.adoc | 4 +-
.../nifi-docs/src/main/asciidoc/user-guide.adoc | 6 +-
.../nifi-nifi-example-nar/pom.xml | 35 ++
.../nifi-nifi-example-processors/pom.xml | 70 ++++
.../nifi/processors/WriteResourceToStream.java | 102 ++++++
.../org.apache.nifi.processor.Processor | 15 +
.../src/main/resources/file.txt | 1 +
.../processors/WriteResourceToStreamTest.java | 47 +++
nifi/nifi-external/nifi-example-bundle/pom.xml | 42 +++
nifi/nifi-external/nifi-spark-receiver/pom.xml | 2 +-
nifi/nifi-external/nifi-storm-spout/pom.xml | 4 +-
.../java/org/apache/nifi/storm/NiFiSpout.java | 38 ++-
nifi/nifi-external/pom.xml | 4 +-
.../nifi-processor-bundle-archetype/pom.xml | 2 +-
.../META-INF/maven/archetype-metadata.xml | 4 +-
nifi/nifi-maven-archetypes/pom.xml | 2 +-
nifi/nifi-mock/pom.xml | 2 +-
.../nifi/util/MockConfigurationContext.java | 11 +
.../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 +-
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
.../nifi-flume-bundle/nifi-flume-nar/pom.xml | 131 +++++++
.../src/main/resources/META-INF/LICENSE | 319 +++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 192 +++++++++++
.../nifi-flume-processors/pom.xml | 176 ++++++++++
.../flume/AbstractFlumeProcessor.java | 160 +++++++++
.../nifi/processors/flume/ExecuteFlumeSink.java | 144 ++++++++
.../processors/flume/ExecuteFlumeSource.java | 195 +++++++++++
.../processors/flume/NifiChannelSelector.java | 69 ++++
.../processors/flume/NifiSessionChannel.java | 47 +++
.../flume/NifiSessionFactoryChannel.java | 50 +++
.../flume/NifiSinkSessionChannel.java | 49 +++
.../processors/flume/NifiSinkTransaction.java | 71 ++++
.../nifi/processors/flume/NifiTransaction.java | 54 +++
.../processors/flume/util/FlowFileEvent.java | 134 ++++++++
.../flume/util/FlowFileEventConstants.java | 40 +++
.../org.apache.nifi.processor.Processor | 16 +
.../additionalDetails.html | 159 +++++++++
.../additionalDetails.html | 114 +++++++
.../processors/flume/ExecuteFlumeSinkTest.java | 169 +++++++++
.../flume/ExecuteFlumeSourceTest.java | 151 +++++++++
.../src/test/resources/core-site-broken.xml | 25 ++
.../src/test/resources/core-site.xml | 30 ++
.../src/test/resources/log4j.properties | 22 ++
.../src/test/resources/simplelogger.properties | 21 ++
.../src/test/resources/testdata/records.txt | 4 +
nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml | 39 +++
.../nifi-framework-nar/pom.xml | 2 +-
.../nifi-framework/nifi-administration/pom.xml | 2 +-
.../nifi-framework/nifi-client-dto/pom.xml | 2 +-
.../web/api/dto/status/ControllerStatusDTO.java | 33 +-
.../nifi-cluster-authorization-provider/pom.xml | 2 +-
.../nifi-framework/nifi-documentation/pom.xml | 7 +-
.../ConfigurableComponentInitializer.java | 9 +-
.../apache/nifi/documentation/DocGenerator.java | 7 +-
.../html/HtmlDocumentationWriter.java | 75 +++-
.../init/ControllerServiceInitializer.java | 25 +-
.../init/ProcessorInitializer.java | 20 +-
.../init/ReportingTaskingInitializer.java | 19 +-
.../mock/MockConfigurationContext.java | 48 +++
.../documentation/mock/MockProcessContext.java | 85 +++++
.../documentation/util/ReflectionUtils.java | 139 ++++++++
.../nifi/documentation/DocGeneratorTest.java | 96 ++++++
.../FullyDocumentedControllerService.java | 63 +++-
.../example/FullyDocumentedProcessor.java | 49 ++-
.../example/FullyDocumentedReportingTask.java | 46 ++-
.../html/HtmlDocumentationWriterTest.java | 35 +-
.../html/ProcessorDocumentationWriterTest.java | 22 +-
.../src/test/resources/conf/nifi.properties | 129 +++++++
.../src/test/resources/lib/example.nar | Bin 0 -> 721040 bytes
.../src/test/resources/lib/jetty.nar | Bin 0 -> 4638519 bytes
.../test/resources/lib/nifi-framework-nar.nar | Bin 0 -> 406 bytes
.../nifi-file-authorization-provider/pom.xml | 2 +-
.../nifi-framework-cluster-protocol/pom.xml | 2 +-
.../nifi-framework-cluster-web/pom.xml | 2 +-
.../nifi-framework-cluster/pom.xml | 2 +-
.../manager/impl/ClusteredReportingContext.java | 46 ++-
.../cluster/manager/impl/WebClusterManager.java | 80 +++--
.../nifi-framework-core-api/pom.xml | 2 +-
.../org/apache/nifi/events/BulletinFactory.java | 30 +-
.../org/apache/nifi/events/SystemBulletin.java | 2 +
.../nifi/logging/LogRepositoryFactory.java | 6 +-
.../java/org/apache/nifi/nar/NarCloseable.java | 44 ---
.../nifi/nar/NarThreadContextClassLoader.java | 187 ----------
.../nifi-framework/nifi-framework-core/pom.xml | 2 +-
.../apache/nifi/controller/FlowController.java | 39 ++-
.../reporting/AbstractReportingTaskNode.java | 4 +-
.../repository/FileSystemRepository.java | 20 +-
.../repository/VolatileContentRepository.java | 8 +-
.../scheduling/StandardProcessScheduler.java | 131 +++----
.../service/ControllerServiceLoader.java | 11 +-
.../service/StandardConfigurationContext.java | 26 +-
.../service/StandardControllerServiceNode.java | 2 +-
.../StandardControllerServiceProvider.java | 10 +-
.../nifi/events/VolatileBulletinRepository.java | 122 +++++--
.../org/apache/nifi/jaxb/AdaptedBulletin.java | 10 +
.../org/apache/nifi/jaxb/BulletinAdapter.java | 3 +-
.../logging/ControllerServiceLogObserver.java | 46 +++
.../nifi/logging/ReportingTaskLogObserver.java | 45 +++
.../nifi/remote/StandardRemoteProcessGroup.java | 18 +-
...nifi.controller.repository.ContentRepository | 16 +
...ifi.controller.repository.FlowFileRepository | 16 +
...fi.controller.repository.FlowFileSwapManager | 15 +
...ler.status.history.ComponentStatusRepository | 15 +
.../TestStandardProcessScheduler.java | 107 ++++++
.../src/test/resources/nifi.properties | 2 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../java/org/apache/nifi/nar/NarCloseable.java | 44 +++
.../nifi/nar/NarThreadContextClassLoader.java | 187 ++++++++++
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../src/main/resources/bin/nifi.sh | 21 +-
.../nifi-framework/nifi-runtime/pom.xml | 2 +-
.../nifi-framework/nifi-security/pom.xml | 2 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 2 +-
.../nifi/remote/StandardRootGroupPort.java | 6 +-
.../src/test/resources/nifi.properties | 2 +-
.../nifi-framework/nifi-user-actions/pom.xml | 2 +-
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +-
.../nifi-web/nifi-ui-extension/pom.xml | 2 +-
.../nifi-web/nifi-web-api/pom.xml | 6 +-
.../nifi/web/StandardNiFiServiceFacade.java | 19 +-
.../org/apache/nifi/web/api/dto/DtoFactory.java | 22 +-
.../nifi/web/controller/ControllerFacade.java | 43 ++-
.../resources/access-control/nifi.properties | 2 +-
.../nifi-web/nifi-web-content-access/pom.xml | 2 +-
.../nifi-web/nifi-web-content-viewer/pom.xml | 2 +-
.../nifi-web/nifi-web-docs/pom.xml | 2 +-
.../nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web-optimistic-locking/pom.xml | 2 +-
.../nifi-web/nifi-web-security/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
.../WEB-INF/partials/canvas/about-dialog.jsp | 4 +-
.../disable-controller-service-dialog.jsp | 7 +-
.../canvas/enable-controller-service-dialog.jsp | 7 +-
.../src/main/webapp/css/controller-service.css | 50 ++-
.../nifi-web-ui/src/main/webapp/css/main.css | 1 +
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 3 +
.../js/nf/canvas/nf-controller-service.js | 261 +++++++++++---
.../webapp/js/nf/canvas/nf-reporting-task.js | 5 +-
.../src/main/webapp/js/nf/canvas/nf-settings.js | 194 ++++++++++-
.../src/main/webapp/js/nf/nf-common.js | 16 +-
.../nifi-framework/nifi-web/pom.xml | 12 +-
.../nifi-framework/pom.xml | 2 +-
.../nifi-framework-bundle/pom.xml | 38 +--
.../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +-
.../nifi-geo-bundle/nifi-geo-processors/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml | 4 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +-
.../nifi-hdfs-processors/pom.xml | 2 +-
.../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 2 +-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 4 +-
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 4 +-
nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 2 +-
nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +-
.../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +-
.../nifi-kafka-processors/pom.xml | 2 +-
.../apache/nifi/processors/kafka/GetKafka.java | 28 +-
nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +-
.../nifi-kite-processors/pom.xml | 2 +-
.../processors/kite/AvroRecordConverter.java | 320 +++++++++++++++++
.../nifi/processors/kite/ConvertAvroSchema.java | 339 +++++++++++++++++++
.../nifi/processors/kite/ConvertCSVToAvro.java | 76 +++--
.../nifi/processors/kite/ConvertJSONToAvro.java | 95 ++++--
.../nifi/processors/kite/FailureTracker.java | 83 +++++
.../org.apache.nifi.processor.Processor | 1 +
.../additionalDetails.html | 142 ++++++++
.../kite/TestAvroRecordConverter.java | 201 +++++++++++
.../processors/kite/TestCSVToAvroProcessor.java | 96 +++++-
.../processors/kite/TestConvertAvroSchema.java | 216 ++++++++++++
.../kite/TestJSONToAvroProcessor.java | 101 +++++-
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 4 +-
.../nifi-language-translation-nar/pom.xml | 4 +-
.../nifi-yandex-processors/pom.xml | 2 +-
.../nifi-language-translation-bundle/pom.xml | 2 +-
.../nifi-mongodb-nar/pom.xml | 6 +-
.../nifi-mongodb-processors/pom.xml | 2 +-
.../nifi-mongodb-bundle/pom.xml | 4 +-
.../pom.xml | 2 +-
.../nifi/provenance/StandardRecordReader.java | 10 +-
.../TestPersistentProvenanceRepository.java | 2 +
.../nifi-provenance-repository-nar/pom.xml | 2 +-
.../nifi-volatile-provenance-repository/pom.xml | 2 +-
.../nifi-provenance-repository-bundle/pom.xml | 6 +-
.../nifi-social-media-nar/pom.xml | 4 +-
.../nifi-twitter-processors/pom.xml | 2 +-
.../nifi-social-media-bundle/pom.xml | 2 +-
.../nifi-solr-bundle/nifi-solr-nar/pom.xml | 4 +-
.../nifi-solr-processors/pom.xml | 2 +-
.../apache/nifi/processors/solr/GetSolr.java | 15 +-
.../nifi/processors/solr/TestGetSolr.java | 29 +-
nifi/nifi-nar-bundles/nifi-solr-bundle/pom.xml | 13 +-
.../nifi-standard-content-viewer/pom.xml | 2 +-
.../nifi-standard-nar/pom.xml | 2 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-standard-processors/pom.xml | 5 +-
.../nifi/processors/standard/GetHTTP.java | 53 ++-
.../nifi/processors/standard/InvokeHTTP.java | 46 ++-
.../nifi/processors/standard/PostHTTP.java | 64 +++-
.../nifi/processors/standard/TestGetHTTP.java | 10 +-
.../standard/TestHandleHttpRequest.java | 2 +-
.../processors/standard/TestInvokeHTTP.java | 129 ++++++-
.../nifi-standard-reporting-tasks/pom.xml | 2 +-
.../apache/nifi/controller/MonitorMemory.java | 14 +-
.../nifi-standard-bundle/pom.xml | 10 +-
.../nifi-dbcp-service-api/pom.xml | 2 +-
.../nifi-dbcp-service-nar/pom.xml | 4 +-
.../nifi-dbcp-service/pom.xml | 4 +-
.../nifi-dbcp-service-bundle/pom.xml | 2 +-
.../pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-distributed-cache-protocol/pom.xml | 2 +-
.../nifi-distributed-cache-server/pom.xml | 2 +-
.../nifi-distributed-cache-services-nar/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-http-context-map-api/pom.xml | 2 +-
.../nifi-http-context-map-nar/pom.xml | 2 +-
.../nifi-http-context-map/pom.xml | 2 +-
.../nifi-http-context-map-bundle/pom.xml | 2 +-
.../nifi-load-distribution-service-api/pom.xml | 2 +-
.../nifi-ssl-context-nar/pom.xml | 2 +-
.../nifi-ssl-context-service/pom.xml | 2 +-
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 2 +-
.../nifi-standard-services-api-nar/pom.xml | 4 +-
.../nifi-standard-services/pom.xml | 2 +-
.../nifi-update-attribute-model/pom.xml | 2 +-
.../nifi-update-attribute-nar/pom.xml | 2 +-
.../nifi-update-attribute-processor/pom.xml | 2 +-
.../nifi-update-attribute-ui/pom.xml | 2 +-
.../nifi-update-attribute-bundle/pom.xml | 8 +-
nifi/nifi-nar-bundles/pom.xml | 31 +-
nifi/pom.xml | 118 ++++---
291 files changed, 8287 insertions(+), 1333 deletions(-)
----------------------------------------------------------------------
[5/6] nifi git commit: [NIFI-784] Per review feedback,
updating to use OnStopped insted of OnUnscheduled to avoid
concurrency issue updating propertyMap. Also removed this from logger
statements since it is already included
Posted by ma...@apache.org.
[NIFI-784] Per review feedback, updating to use OnStopped insted of OnUnscheduled to avoid concurrency issue updating propertyMap. Also removed this from logger statements since it is already included
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/85079020
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/85079020
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/85079020
Branch: refs/heads/develop
Commit: 85079020967918a5afeb4eba8c9e6e99766a1718
Parents: 4a43e81
Author: Brian Ghigiarelli <br...@gmail.com>
Authored: Fri Jul 24 15:26:22 2015 -0400
Committer: Brian Ghigiarelli <br...@gmail.com>
Committed: Fri Jul 24 15:26:22 2015 -0400
----------------------------------------------------------------------
.../processors/standard/RouteOnAttribute.java | 24 ++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/85079020/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
index 52dc80b..a9be2e7 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
@@ -34,7 +34,7 @@ import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
-import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
+import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
@@ -105,7 +105,12 @@ public class RouteOnAttribute extends AbstractProcessor {
private volatile String configuredRouteStrategy = ROUTE_STRATEGY.getDefaultValue();
private volatile Set<String> dynamicPropertyNames = new HashSet<>();
- private final Map<Relationship, PropertyValue> propertyMap = new HashMap<>();
+ /**
+ * Cache of dynamic properties set during {@link #onScheduled(ProcessContext)} and
+ * cleared during {@link #onStopped(ProcessContext)} for quick access in
+ * {@link #onTrigger(ProcessContext, ProcessSession)}
+ */
+ private volatile Map<Relationship, PropertyValue> propertyMap = new HashMap<>();
@Override
protected void init(final ProcessorInitializationContext context) {
@@ -171,8 +176,9 @@ public class RouteOnAttribute extends AbstractProcessor {
}
/**
- * When this processor is
- * @param context
+ * When this processor is scheduled, update the dynamic properties into the map
+ * for quick access during each onTrigger call
+ * @param context ProcessContext used to retrieve dynamic properties
*/
@OnScheduled
public void onScheduled(final ProcessContext context) {
@@ -184,9 +190,9 @@ public class RouteOnAttribute extends AbstractProcessor {
propertyMap.put(new Relationship.Builder().name(descriptor.getName()).build(), context.getProperty(descriptor));
}
}
-
- @OnUnscheduled
- public void onUnscheduled(final ProcessContext context) {
+
+ @OnStopped
+ public void onStopped() {
getLogger().debug("Clearing propertyMap");
propertyMap.clear();
}
@@ -233,7 +239,7 @@ public class RouteOnAttribute extends AbstractProcessor {
}
if (destinationRelationships.isEmpty()) {
- logger.info("{} routing {} to unmatched", new Object[]{ this, flowFile });
+ logger.info("Routing {} to unmatched", new Object[]{ flowFile });
flowFile = session.putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, REL_NO_MATCH.getName());
session.getProvenanceReporter().route(flowFile, REL_NO_MATCH);
session.transfer(flowFile, REL_NO_MATCH);
@@ -253,7 +259,7 @@ public class RouteOnAttribute extends AbstractProcessor {
// now transfer any clones generated
for (final Map.Entry<Relationship, FlowFile> entry : transferMap.entrySet()) {
- logger.info("{} cloned {} into {} and routing clone to relationship {}", new Object[]{ this, flowFile, entry.getValue(), entry.getKey() });
+ logger.info("Cloned {} into {} and routing clone to relationship {}", new Object[]{ flowFile, entry.getValue(), entry.getKey() });
FlowFile updatedFlowFile = session.putAttribute(entry.getValue(), ROUTE_ATTRIBUTE_KEY, entry.getKey().getName());
session.getProvenanceReporter().route(updatedFlowFile, entry.getKey());
session.transfer(updatedFlowFile, entry.getKey());
[4/6] nifi git commit: [NIFI-784] Moving dynamic propertyMap to
onScheduled method and updating logger statements to use lazy evaluation with
String formatter
Posted by ma...@apache.org.
[NIFI-784] Moving dynamic propertyMap to onScheduled method and updating logger statements to use lazy evaluation with String formatter
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4a43e813
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4a43e813
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4a43e813
Branch: refs/heads/develop
Commit: 4a43e81343b4eaf967a7e5a5417fd7bb35226503
Parents: a1af29e
Author: Brian Ghigiarelli <br...@gmail.com>
Authored: Thu Jul 23 22:52:35 2015 -0400
Committer: Brian Ghigiarelli <br...@gmail.com>
Committed: Thu Jul 23 22:52:35 2015 -0400
----------------------------------------------------------------------
.../processors/standard/RouteOnAttribute.java | 39 ++++++++++++++------
1 file changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/4a43e813/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
index 69107dd..52dc80b 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
@@ -27,12 +27,14 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.nifi.annotation.behavior.DynamicProperty;
+import org.apache.nifi.annotation.behavior.DynamicRelationship;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.SideEffectFree;
import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
-import org.apache.nifi.annotation.behavior.DynamicRelationship;
import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.annotation.lifecycle.OnUnscheduled;
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
@@ -103,6 +105,8 @@ public class RouteOnAttribute extends AbstractProcessor {
private volatile String configuredRouteStrategy = ROUTE_STRATEGY.getDefaultValue();
private volatile Set<String> dynamicPropertyNames = new HashSet<>();
+ private final Map<Relationship, PropertyValue> propertyMap = new HashMap<>();
+
@Override
protected void init(final ProcessorInitializationContext context) {
final Set<Relationship> set = new HashSet<>();
@@ -166,6 +170,27 @@ public class RouteOnAttribute extends AbstractProcessor {
this.relationships.set(newRelationships);
}
+ /**
+ * When this processor is
+ * @param context
+ */
+ @OnScheduled
+ public void onScheduled(final ProcessContext context) {
+ for (final PropertyDescriptor descriptor : context.getProperties().keySet()) {
+ if (!descriptor.isDynamic()) {
+ continue;
+ }
+ getLogger().debug("Adding new dynamic property: {}", new Object[]{descriptor});
+ propertyMap.put(new Relationship.Builder().name(descriptor.getName()).build(), context.getProperty(descriptor));
+ }
+ }
+
+ @OnUnscheduled
+ public void onUnscheduled(final ProcessContext context) {
+ getLogger().debug("Clearing propertyMap");
+ propertyMap.clear();
+ }
+
@Override
public void onTrigger(final ProcessContext context, final ProcessSession session) {
FlowFile flowFile = session.get();
@@ -174,14 +199,6 @@ public class RouteOnAttribute extends AbstractProcessor {
}
final ProcessorLog logger = getLogger();
- final Map<Relationship, PropertyValue> propertyMap = new HashMap<>();
- for (final PropertyDescriptor descriptor : context.getProperties().keySet()) {
- if (!descriptor.isDynamic()) {
- continue;
- }
-
- propertyMap.put(new Relationship.Builder().name(descriptor.getName()).build(), context.getProperty(descriptor));
- }
final Set<Relationship> matchingRelationships = new HashSet<>();
for (final Map.Entry<Relationship, PropertyValue> entry : propertyMap.entrySet()) {
@@ -216,7 +233,7 @@ public class RouteOnAttribute extends AbstractProcessor {
}
if (destinationRelationships.isEmpty()) {
- logger.info(this + " routing " + flowFile + " to unmatched");
+ logger.info("{} routing {} to unmatched", new Object[]{ this, flowFile });
flowFile = session.putAttribute(flowFile, ROUTE_ATTRIBUTE_KEY, REL_NO_MATCH.getName());
session.getProvenanceReporter().route(flowFile, REL_NO_MATCH);
session.transfer(flowFile, REL_NO_MATCH);
@@ -236,7 +253,7 @@ public class RouteOnAttribute extends AbstractProcessor {
// now transfer any clones generated
for (final Map.Entry<Relationship, FlowFile> entry : transferMap.entrySet()) {
- logger.info(this + " cloned " + flowFile + " into " + entry.getValue() + " and routing clone to relationship " + entry.getKey());
+ logger.info("{} cloned {} into {} and routing clone to relationship {}", new Object[]{ this, flowFile, entry.getValue(), entry.getKey() });
FlowFile updatedFlowFile = session.putAttribute(entry.getValue(), ROUTE_ATTRIBUTE_KEY, entry.getKey().getName());
session.getProvenanceReporter().route(updatedFlowFile, entry.getKey());
session.transfer(updatedFlowFile, entry.getKey());
[6/6] nifi git commit: Merge branch 'NIFI-784' of
https://github.com/brianghig/nifi into develop
Posted by ma...@apache.org.
Merge branch 'NIFI-784' of https://github.com/brianghig/nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bbacc3d8
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bbacc3d8
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bbacc3d8
Branch: refs/heads/develop
Commit: bbacc3d8caf55a7773797208cc744debd11cf1bc
Parents: c2c513e 8507902
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Aug 12 09:59:50 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Aug 12 09:59:50 2015 -0400
----------------------------------------------------------------------
.../processors/standard/RouteOnAttribute.java | 45 +++++++++++++++-----
1 file changed, 34 insertions(+), 11 deletions(-)
----------------------------------------------------------------------