Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e989215f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e989215f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e989215f Branch: refs/heads/NIFI-250 Commit: e989215fa539f61eba7c915d1b04adebcc771c69 Parents: 0c021c7 6b560b9 Author: Matt Gilman <[email protected]> Authored: Mon Jan 26 09:19:12 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Jan 26 09:19:12 2015 -0500 ---------------------------------------------------------------------- .gitignore | 2 + .../nifi/annotation/behavior/EventDriven.java | 49 ++++ .../annotation/behavior/SideEffectFree.java | 47 ++++ .../annotation/behavior/SupportsBatching.java | 52 ++++ .../annotation/behavior/TriggerSerially.java | 40 +++ .../TriggerWhenAnyDestinationAvailable.java | 42 +++ .../annotation/behavior/TriggerWhenEmpty.java | 42 +++ .../documentation/CapabilityDescription.java | 41 +++ .../nifi/annotation/documentation/Tags.java | 46 +++ .../nifi/annotation/lifecycle/OnAdded.java | 44 +++ .../nifi/annotation/lifecycle/OnDisabled.java | 46 +++ .../nifi/annotation/lifecycle/OnEnabled.java | 64 +++++ .../nifi/annotation/lifecycle/OnRemoved.java | 43 +++ .../nifi/annotation/lifecycle/OnScheduled.java | 62 +++++ .../nifi/annotation/lifecycle/OnShutdown.java | 42 +++ .../nifi/annotation/lifecycle/OnStopped.java | 59 ++++ .../annotation/lifecycle/OnUnscheduled.java | 58 ++++ .../controller/annotation/OnConfigured.java | 3 + .../AbstractSessionFactoryProcessor.java | 4 +- .../annotation/CapabilityDescription.java | 3 + .../nifi/processor/annotation/EventDriven.java | 3 + .../nifi/processor/annotation/OnAdded.java | 2 + .../nifi/processor/annotation/OnRemoved.java | 2 + .../nifi/processor/annotation/OnScheduled.java | 4 +- .../nifi/processor/annotation/OnShutdown.java | 2 + .../nifi/processor/annotation/OnStopped.java | 2 + .../processor/annotation/OnUnscheduled.java | 2 + .../processor/annotation/SideEffectFree.java | 2 + .../processor/annotation/SupportsBatching.java | 2 + .../apache/nifi/processor/annotation/Tags.java | 3 + .../processor/annotation/TriggerSerially.java | 4 +- .../TriggerWhenAnyDestinationAvailable.java | 2 + .../processor/annotation/TriggerWhenEmpty.java | 2 + .../util/ControllerServiceConfiguration.java | 2 +- .../nifi/util/MockControllerServiceLookup.java | 10 + .../apache/nifi/util/MockProcessContext.java | 1 + .../apache/nifi/util/MockProcessSession.java | 1 - .../nifi/util/StandardProcessorTestRunner.java | 231 ++++++++++++++- .../java/org/apache/nifi/util/TestRunner.java | 155 +++++++++++ .../util/TestStandardProcessorTestRunner.java | 86 ++++++ .../cluster/manager/impl/WebClusterManager.java | 35 ++- .../nifi/controller/ReportingTaskNode.java | 21 ++ .../service/ControllerServiceNode.java | 9 +- .../service/ControllerServiceProvider.java | 34 ++- .../apache/nifi/controller/FlowController.java | 74 ++++- .../nifi/controller/StandardProcessorNode.java | 46 +-- .../reporting/AbstractReportingTaskNode.java | 99 +++++++ .../scheduling/EventDrivenSchedulingAgent.java | 6 +- .../scheduling/StandardProcessScheduler.java | 120 +++++--- .../service/ControllerServiceLoader.java | 19 +- .../service/StandardControllerServiceNode.java | 85 +++++- .../StandardControllerServiceProvider.java | 70 ++++- .../tasks/ContinuallyRunConnectableTask.java | 6 +- .../tasks/ContinuallyRunProcessorTask.java | 6 +- .../controller/tasks/ReportingTaskWrapper.java | 6 +- .../nifi/groups/StandardProcessGroup.java | 11 +- .../processor/StandardSchedulingContext.java | 4 +- .../org/apache/nifi/util/ReflectionUtils.java | 278 ++++++++++++++----- .../StubAttributeLoggerProcessor.java | 2 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 26 +- .../nifi/web/controller/ControllerFacade.java | 18 +- .../hadoop/AbstractHadoopProcessor.java | 5 +- .../hadoop/CreateHadoopSequenceFile.java | 7 +- .../apache/nifi/processors/hadoop/GetHDFS.java | 9 +- .../processors/hadoop/GetHDFSSequenceFile.java | 7 +- .../apache/nifi/processors/hadoop/PutHDFS.java | 6 +- .../apache/nifi/processors/kafka/GetKafka.java | 12 +- .../apache/nifi/processors/kafka/PutKafka.java | 8 +- .../nifi/processors/kafka/TestPutKafka.java | 2 +- .../standard/Base64EncodeContent.java | 41 +-- .../processors/standard/CompressContent.java | 10 +- .../nifi/processors/standard/ControlRate.java | 8 +- .../standard/ConvertCharacterSet.java | 10 +- .../processors/standard/DetectDuplicate.java | 8 +- .../processors/standard/DistributeLoad.java | 14 +- .../processors/standard/EncryptContent.java | 10 +- .../standard/EvaluateRegularExpression.java | 10 +- .../nifi/processors/standard/EvaluateXPath.java | 12 +- .../processors/standard/EvaluateXQuery.java | 10 +- .../standard/ExecuteStreamCommand.java | 8 +- .../processors/standard/GenerateFlowFile.java | 8 +- .../apache/nifi/processors/standard/GetFTP.java | 6 +- .../nifi/processors/standard/GetFile.java | 8 +- .../processors/standard/GetFileTransfer.java | 2 +- .../nifi/processors/standard/GetHTTP.java | 6 +- .../nifi/processors/standard/GetJMSQueue.java | 8 +- .../nifi/processors/standard/GetJMSTopic.java | 14 +- .../nifi/processors/standard/GetSFTP.java | 6 +- .../nifi/processors/standard/HashAttribute.java | 10 +- .../nifi/processors/standard/HashContent.java | 8 +- .../processors/standard/IdentifyMimeType.java | 10 +- .../nifi/processors/standard/InvokeHTTP.java | 6 +- .../nifi/processors/standard/ListenHTTP.java | 8 +- .../nifi/processors/standard/ListenUDP.java | 12 +- .../nifi/processors/standard/LogAttribute.java | 8 +- .../nifi/processors/standard/MergeContent.java | 12 +- .../nifi/processors/standard/ModifyBytes.java | 8 +- .../processors/standard/MonitorActivity.java | 10 +- .../nifi/processors/standard/PostHTTP.java | 10 +- .../nifi/processors/standard/PutEmail.java | 6 +- .../apache/nifi/processors/standard/PutFTP.java | 8 +- .../nifi/processors/standard/PutFile.java | 6 +- .../apache/nifi/processors/standard/PutJMS.java | 6 +- .../nifi/processors/standard/PutSFTP.java | 6 +- .../nifi/processors/standard/ReplaceText.java | 10 +- .../standard/ReplaceTextWithMapping.java | 10 +- .../processors/standard/RouteOnAttribute.java | 10 +- .../processors/standard/RouteOnContent.java | 10 +- .../nifi/processors/standard/ScanAttribute.java | 12 +- .../nifi/processors/standard/ScanContent.java | 10 +- .../processors/standard/SegmentContent.java | 10 +- .../nifi/processors/standard/SplitContent.java | 10 +- .../nifi/processors/standard/SplitText.java | 10 +- .../nifi/processors/standard/SplitXml.java | 10 +- .../nifi/processors/standard/TransformXml.java | 10 +- .../nifi/processors/standard/UnpackContent.java | 10 +- .../nifi/processors/standard/ValidateXml.java | 12 +- .../standard/RESTServiceContentModified.java | 2 +- .../standard/TestCompressContent.java | 5 +- .../standard/TestConvertCharacterSet.java | 3 - .../standard/TestDetectDuplicate.java | 10 +- .../nifi/processors/standard/TestGetHTTP.java | 16 +- .../processors/standard/TestInvokeHTTP.java | 4 +- .../ControllerStatusReportingTask.java | 13 +- .../nifi/controller/MonitorDiskUsage.java | 7 +- .../apache/nifi/controller/MonitorMemory.java | 12 +- .../ganglia/StandardGangliaReporter.java | 15 +- .../cache/client/DistributedMapCacheClient.java | 5 + .../cache/client/DistributedSetCacheClient.java | 5 + .../DistributedMapCacheClientService.java | 9 +- .../DistributedSetCacheClientService.java | 9 +- .../cache/server/DistributedCacheServer.java | 6 +- .../cache/server/DistributedSetCacheServer.java | 6 +- .../server/map/DistributedMapCacheServer.java | 5 + .../nifi/ssl/StandardSSLContextService.java | 9 +- .../apache/nifi/ssl/SSLContextServiceTest.java | 182 +++++------- .../org/apache/nifi/ssl/SSLContextService.java | 5 + .../processors/attributes/UpdateAttribute.java | 11 +- 138 files changed, 2485 insertions(+), 659 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e989215f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e989215f/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java ----------------------------------------------------------------------
