Merge branch 'master' into NIFI-730
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e4cebba3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e4cebba3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e4cebba3 Branch: refs/heads/master Commit: e4cebba3c7868010c2b9fd994b850f40b81aa044 Parents: 5a04021 a549621 Author: Mark Payne <[email protected]> Authored: Mon Nov 2 14:02:16 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Mon Nov 2 14:02:16 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/action/Action.java | 50 ++ .../java/org/apache/nifi/action/Component.java | 34 + .../java/org/apache/nifi/action/Operation.java | 37 + .../component/details/ComponentDetails.java | 26 + .../component/details/ExtensionDetails.java | 26 + .../details/RemoteProcessGroupDetails.java | 26 + .../nifi/action/details/ActionDetails.java | 26 + .../nifi/action/details/ConfigureDetails.java | 30 + .../nifi/action/details/ConnectDetails.java | 40 + .../apache/nifi/action/details/MoveDetails.java | 30 + .../nifi/action/details/PurgeDetails.java | 28 + .../annotation/behavior/InputRequirement.java | 67 ++ .../apache/nifi/processor/ProcessSession.java | 27 + .../nifi/provenance/ProvenanceEventType.java | 31 +- .../nifi/provenance/ProvenanceReporter.java | 37 + .../org/apache/nifi/reporting/EventAccess.java | 13 + .../StandardProvenanceEventRecord.java | 36 +- .../nifi/provenance/StandardQueryResult.java | 25 +- .../nifi/processor/util/StandardValidators.java | 10 + .../client/socket/EndpointConnectionPool.java | 3 +- .../src/main/asciidoc/administration-guide.adoc | 4 +- .../src/main/asciidoc/developer-guide.adoc | 11 + .../src/main/asciidoc/getting-started.adoc | 754 +++++++++++++++++ .../src/main/asciidoc/images/add-processor.png | Bin 31524 -> 92164 bytes nifi-docs/src/main/asciidoc/user-guide.adoc | 2 +- .../src/main/java/MyProcessor.java | 11 +- .../org/apache/nifi/util/MockEventAccess.java | 27 + .../apache/nifi/util/MockProcessSession.java | 8 + .../nifi/util/MockProvenanceReporter.java | 35 +- .../nifi/processors/avro/ConvertAvroToJSON.java | 70 +- .../processors/avro/ExtractAvroMetadata.java | 29 +- .../apache/nifi/processors/avro/SplitAvro.java | 27 +- .../processors/avro/TestConvertAvroToJSON.java | 47 +- .../processors/aws/AbstractAWSProcessor.java | 2 +- .../nifi/processors/aws/s3/DeleteS3Object.java | 98 +++ .../nifi/processors/aws/s3/FetchS3Object.java | 5 +- .../nifi/processors/aws/s3/PutS3Object.java | 48 +- .../apache/nifi/processors/aws/sns/PutSNS.java | 3 + .../nifi/processors/aws/sqs/DeleteSQS.java | 3 + .../apache/nifi/processors/aws/sqs/GetSQS.java | 5 +- .../apache/nifi/processors/aws/sqs/PutSQS.java | 5 +- .../org.apache.nifi.processor.Processor | 1 + .../processors/aws/s3/TestDeleteS3Object.java | 141 ++++ .../nifi/processors/flume/ExecuteFlumeSink.java | 14 +- .../processors/flume/ExecuteFlumeSource.java | 14 +- .../org/apache/nifi/admin/dao/ActionDAO.java | 12 +- .../java/org/apache/nifi/admin/dao/UserDAO.java | 3 +- .../nifi/admin/dao/impl/StandardActionDAO.java | 93 ++- .../nifi/admin/dao/impl/StandardUserDAO.java | 4 +- .../apache/nifi/admin/service/AuditService.java | 18 +- .../admin/service/action/AddActionsAction.java | 3 +- .../service/action/PurgeActionsAction.java | 3 +- .../service/impl/StandardAuditService.java | 24 +- .../resources/nifi-administration-context.xml | 2 +- .../apache/nifi/web/api/dto/ProcessorDTO.java | 15 + .../manager/impl/ClusteredEventAccess.java | 21 +- .../cluster/manager/impl/WebClusterManager.java | 2 +- .../apache/nifi/controller/ProcessorNode.java | 7 +- .../apache/nifi/controller/FlowController.java | 15 +- .../nifi/controller/FlowUnmarshaller.java | 77 -- .../nifi/controller/StandardProcessorNode.java | 109 ++- .../apache/nifi/controller/TemplateManager.java | 1 + .../repository/BatchingSessionFactory.java | 5 + .../repository/FileSystemRepository.java | 40 +- .../repository/StandardProcessSession.java | 12 + .../repository/StandardProvenanceReporter.java | 31 +- .../nifi/processor/SimpleProcessLogger.java | 20 +- .../nifi/spring/FlowControllerFactoryBean.java | 8 + .../src/main/resources/FlowConfiguration.xsd | 2 +- .../src/main/resources/nifi-context.xml | 1 + .../controller/StandardFlowServiceTest.java | 5 +- .../repository/TestFileSystemRepository.java | 18 + .../repository/TestStandardProcessSession.java | 39 +- .../nifi/processor/TestSimpleProcessLogger.java | 101 +++ .../src/main/resources/bin/nifi.sh | 96 +-- .../nifi-framework/nifi-user-actions/pom.xml | 7 + .../java/org/apache/nifi/action/Action.java | 121 --- .../java/org/apache/nifi/action/Component.java | 34 - .../apache/nifi/action/FlowChangeAction.java | 130 +++ .../java/org/apache/nifi/action/Operation.java | 37 - .../component/details/ComponentDetails.java | 26 - .../component/details/ExtensionDetails.java | 34 - .../details/FlowChangeExtensionDetails.java | 35 + .../FlowChangeRemoteProcessGroupDetails.java | 35 + .../details/RemoteProcessGroupDetails.java | 34 - .../nifi/action/details/ActionDetails.java | 26 - .../nifi/action/details/ConfigureDetails.java | 52 -- .../nifi/action/details/ConnectDetails.java | 90 -- .../details/FlowChangeConfigureDetails.java | 55 ++ .../details/FlowChangeConnectDetails.java | 97 +++ .../action/details/FlowChangeMoveDetails.java | 65 ++ .../action/details/FlowChangePurgeDetails.java | 46 + .../apache/nifi/action/details/MoveDetails.java | 61 -- .../nifi/action/details/PurgeDetails.java | 45 - .../apache/nifi/audit/ControllerAuditor.java | 27 +- .../nifi/audit/ControllerServiceAuditor.java | 43 +- .../org/apache/nifi/audit/FunnelAuditor.java | 7 +- .../java/org/apache/nifi/audit/NiFiAuditor.java | 25 +- .../java/org/apache/nifi/audit/PortAuditor.java | 27 +- .../apache/nifi/audit/ProcessGroupAuditor.java | 25 +- .../org/apache/nifi/audit/ProcessorAuditor.java | 25 +- .../apache/nifi/audit/RelationshipAuditor.java | 18 +- .../nifi/audit/RemoteProcessGroupAuditor.java | 35 +- .../apache/nifi/audit/ReportingTaskAuditor.java | 25 +- .../org/apache/nifi/audit/SnippetAuditor.java | 26 +- .../nifi/web/StandardNiFiServiceFacade.java | 9 +- .../StandardNiFiWebConfigurationContext.java | 13 +- .../apache/nifi/web/StandardNiFiWebContext.java | 13 +- .../nifi/web/api/ApplicationResource.java | 5 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 21 +- .../partials/provenance/provenance-content.jsp | 2 + .../nifi-web-ui/src/main/webapp/css/main.css | 7 +- .../src/main/webapp/js/nf/canvas/nf-actions.js | 20 +- .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 13 +- .../js/nf/canvas/nf-connection-configuration.js | 8 +- .../main/webapp/js/nf/canvas/nf-context-menu.js | 23 +- .../js/nf/provenance/nf-provenance-table.js | 54 +- .../webapp/js/nf/provenance/nf-provenance.js | 16 +- .../org/apache/nifi/processors/GeoEnrichIP.java | 3 + .../hadoop/AbstractHadoopProcessor.java | 92 +- .../hadoop/CreateHadoopSequenceFile.java | 4 +- .../nifi/processors/hadoop/FetchHDFS.java | 5 +- .../apache/nifi/processors/hadoop/GetHDFS.java | 3 + .../apache/nifi/processors/hadoop/ListHDFS.java | 3 + .../apache/nifi/processors/hadoop/PutHDFS.java | 3 + .../processors/hl7/ExtractHL7Attributes.java | 3 + .../apache/nifi/processors/hl7/RouteHL7.java | 3 + .../processors/image/ExtractImageMetadata.java | 36 +- .../nifi/processors/image/ResizeImage.java | 38 +- .../apache/nifi/processors/kafka/GetKafka.java | 21 +- .../apache/nifi/processors/kafka/PutKafka.java | 16 +- .../processors/kite/AbstractKiteProcessor.java | 11 +- .../nifi/processors/kite/ConvertCSVToAvro.java | 312 +++---- .../nifi/processors/kite/ConvertJSONToAvro.java | 14 +- .../processors/kite/StoreInKiteDataset.java | 9 +- .../processors/kite/TestCSVToAvroProcessor.java | 39 + .../nifi/processors/yandex/YandexTranslate.java | 3 + .../nifi/provenance/IndexConfiguration.java | 47 +- .../PersistentProvenanceRepository.java | 124 +-- .../nifi/provenance/lucene/DocsReader.java | 49 +- .../nifi/provenance/lucene/IndexSearch.java | 35 +- .../nifi/provenance/lucene/LineageQuery.java | 7 +- .../TestPersistentProvenanceRepository.java | 163 +++- .../VolatileProvenanceRepository.java | 16 +- .../nifi/processors/twitter/GetTwitter.java | 5 +- .../apache/nifi/processors/solr/GetSolr.java | 43 +- .../processors/solr/PutSolrContentStream.java | 33 +- .../nifi-standard-prioritizers/pom.xml | 4 + .../PriorityAttributePrioritizer.java | 7 +- .../PriorityAttributePrioritizerTest.java | 17 +- .../nifi-standard-processors/pom.xml | 8 + .../standard/AbstractListProcessor.java | 507 +++++++++++ .../processors/standard/AttributesToJSON.java | 242 ++++++ .../standard/Base64EncodeContent.java | 31 +- .../processors/standard/CompressContent.java | 15 +- .../nifi/processors/standard/ControlRate.java | 113 +-- .../standard/ConvertCharacterSet.java | 22 +- .../processors/standard/ConvertJSONToSQL.java | 3 + .../processors/standard/DetectDuplicate.java | 3 + .../processors/standard/DistributeLoad.java | 3 + .../processors/standard/DuplicateFlowFile.java | 3 + .../nifi/processors/standard/EncodeContent.java | 15 +- .../processors/standard/EncryptContent.java | 3 + .../processors/standard/EvaluateJsonPath.java | 38 +- .../nifi/processors/standard/EvaluateXPath.java | 29 +- .../processors/standard/EvaluateXQuery.java | 25 +- .../processors/standard/ExecuteProcess.java | 3 + .../nifi/processors/standard/ExecuteSQL.java | 12 +- .../standard/ExecuteStreamCommand.java | 7 +- .../nifi/processors/standard/ExtractText.java | 3 + .../processors/standard/FetchFileTransfer.java | 346 ++++++++ .../nifi/processors/standard/FetchSFTP.java | 93 +++ .../processors/standard/GenerateFlowFile.java | 11 +- .../apache/nifi/processors/standard/GetFTP.java | 13 +- .../nifi/processors/standard/GetFile.java | 7 +- .../nifi/processors/standard/GetHTTP.java | 3 + .../nifi/processors/standard/GetJMSQueue.java | 3 + .../nifi/processors/standard/GetJMSTopic.java | 3 + .../nifi/processors/standard/GetSFTP.java | 7 +- .../processors/standard/HandleHttpRequest.java | 30 +- .../processors/standard/HandleHttpResponse.java | 5 +- .../nifi/processors/standard/HashAttribute.java | 5 +- .../nifi/processors/standard/HashContent.java | 5 +- .../processors/standard/IdentifyMimeType.java | 5 +- .../nifi/processors/standard/InvokeHTTP.java | 201 ++--- .../nifi/processors/standard/JmsConsumer.java | 2 + .../processors/standard/ListFileTransfer.java | 119 +++ .../nifi/processors/standard/ListSFTP.java | 88 ++ .../nifi/processors/standard/ListenHTTP.java | 121 +-- .../nifi/processors/standard/ListenUDP.java | 18 +- .../nifi/processors/standard/LogAttribute.java | 16 +- .../nifi/processors/standard/MergeContent.java | 17 +- .../nifi/processors/standard/ModifyBytes.java | 14 +- .../processors/standard/MonitorActivity.java | 31 +- .../nifi/processors/standard/PostHTTP.java | 3 + .../standard/PutDistributedMapCache.java | 252 ++++++ .../nifi/processors/standard/PutEmail.java | 3 + .../apache/nifi/processors/standard/PutFTP.java | 3 + .../nifi/processors/standard/PutFile.java | 3 + .../apache/nifi/processors/standard/PutJMS.java | 7 +- .../nifi/processors/standard/PutSFTP.java | 3 + .../apache/nifi/processors/standard/PutSQL.java | 159 ++-- .../nifi/processors/standard/ReplaceText.java | 485 ++++++++--- .../standard/ReplaceTextWithMapping.java | 18 +- .../processors/standard/RouteOnAttribute.java | 3 + .../processors/standard/RouteOnContent.java | 19 +- .../nifi/processors/standard/ScanAttribute.java | 19 +- .../nifi/processors/standard/ScanContent.java | 5 +- .../processors/standard/SegmentContent.java | 7 +- .../nifi/processors/standard/SplitContent.java | 7 +- .../nifi/processors/standard/SplitJson.java | 32 +- .../nifi/processors/standard/SplitText.java | 53 +- .../nifi/processors/standard/SplitXml.java | 18 +- .../nifi/processors/standard/TransformXml.java | 3 + .../nifi/processors/standard/UnpackContent.java | 9 +- .../nifi/processors/standard/ValidateXml.java | 16 +- .../servlets/ContentAcknowledgmentServlet.java | 3 +- .../standard/servlets/ListenHTTPServlet.java | 8 +- .../processors/standard/util/EntityListing.java | 71 ++ .../processors/standard/util/FTPTransfer.java | 145 ++-- .../nifi/processors/standard/util/FileInfo.java | 18 +- .../processors/standard/util/FileTransfer.java | 337 ++++---- .../processors/standard/util/JdbcCommon.java | 76 +- .../processors/standard/util/JmsFactory.java | 79 +- .../processors/standard/util/JmsProperties.java | 8 + .../standard/util/ListableEntity.java | 40 + .../util/PermissionDeniedException.java | 32 + .../processors/standard/util/SFTPTransfer.java | 191 +++-- .../org.apache.nifi.processor.Processor | 4 + .../standard/TestAbstractListProcessor.java | 221 +++++ .../standard/TestAttributesToJSON.java | 282 +++++++ .../standard/TestConvertCharacterSet.java | 64 +- .../standard/TestFetchFileTransfer.java | 317 +++++++ .../nifi/processors/standard/TestGetFile.java | 21 +- .../processors/standard/TestInvokeHTTP.java | 607 +------------- .../processors/standard/TestInvokeHttpSSL.java | 90 ++ .../standard/TestPutDistributedMapCache.java | 277 +++++++ .../nifi/processors/standard/TestPutSQL.java | 46 +- .../processors/standard/TestReplaceText.java | 635 +++++++++++++- .../standard/TestReplaceTextLineByLine.java | 336 -------- .../standard/util/TestInvokeHttpCommon.java | 830 +++++++++++++++++++ .../standard/util/TestJdbcCommon.java | 87 ++ .../standard/util/TestJdbcTypesDerby.java | 133 +++ .../standard/util/TestJdbcTypesH2.java | 149 ++++ .../AppendLineByLineTest.txt | 11 + .../PrependLineByLineTest.txt | 11 + .../processors/attributes/UpdateAttribute.java | 9 +- pom.xml | 2 +- 248 files changed, 10506 insertions(+), 3447 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --cc nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index 20f2642,135025e..701459c --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@@ -16,40 -16,11 +16,39 @@@ */ package org.apache.nifi.controller; -import com.sun.jersey.api.client.ClientHandlerException; -import org.apache.commons.lang3.StringUtils; +import static java.util.Objects.requireNonNull; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import javax.net.ssl.SSLContext; + - import org.apache.commons.lang3.StringUtils; - import org.apache.nifi.admin.service.UserService; + import org.apache.nifi.action.Action; -import org.apache.nifi.admin.service.AuditService; -import org.apache.nifi.admin.service.UserService; import org.apache.nifi.annotation.lifecycle.OnAdded; import org.apache.nifi.annotation.lifecycle.OnRemoved; import org.apache.nifi.annotation.lifecycle.OnShutdown; http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/BatchingSessionFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/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/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e4cebba3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js ----------------------------------------------------------------------
