Merge branch 'develop' into ListHDFS
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3e767fbd Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3e767fbd Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3e767fbd Branch: refs/heads/develop Commit: 3e767fbdf3af66d3348d974a1c8a669819d5f6d9 Parents: e4f4315 6c3256e Author: Mark Payne <[email protected]> Authored: Tue Apr 28 08:47:23 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Tue Apr 28 08:47:23 2015 -0400 ---------------------------------------------------------------------- nifi-nar-maven-plugin/pom.xml | 7 + nifi-parent/pom.xml | 67 +++-- .../flowfile/attributes/CoreAttributes.java | 12 +- .../apache/nifi/remote/VersionNegotiator.java | 15 +- .../TransmissionDisabledException.java | 3 +- .../nifi/remote/io/CompressionOutputStream.java | 3 +- .../remote/io/socket/BufferStateManager.java | 4 +- .../socket/ssl/SSLSocketChannelInputStream.java | 3 +- .../ssl/SSLSocketChannelOutputStream.java | 3 +- .../nifi/stream/io/BufferedInputStream.java | 7 +- .../nifi/stream/io/BufferedOutputStream.java | 31 +-- .../nifi/stream/io/ByteArrayInputStream.java | 113 +++----- .../nifi/stream/io/ByteArrayOutputStream.java | 80 ++---- .../stream/io/ByteCountingOutputStream.java | 5 +- .../apache/nifi/stream/io/DataOutputStream.java | 113 +++----- .../apache/nifi/stream/io/GZIPOutputStream.java | 4 +- .../stream/io/LeakyBucketStreamThrottler.java | 3 +- .../stream/io/MinimumLengthInputStream.java | 3 +- .../nifi/stream/io/NonCloseableInputStream.java | 5 +- .../org/apache/nifi/stream/io/StreamUtils.java | 30 +-- .../apache/nifi/stream/io/ZipOutputStream.java | 5 +- .../java/org/apache/nifi/util/EscapeUtils.java | 4 +- .../java/org/apache/nifi/util/LongHolder.java | 6 +- .../apache/nifi/util/NaiveSearchRingBuffer.java | 21 +- .../java/org/apache/nifi/util/RingBuffer.java | 26 +- .../java/org/apache/nifi/util/StopWatch.java | 3 +- .../org/apache/nifi/util/file/FileUtils.java | 114 +++----- .../file/monitor/CompoundUpdateMonitor.java | 7 +- .../file/monitor/SynchronousFileWatcher.java | 6 +- .../org/apache/nifi/util/search/Search.java | 18 +- .../org/apache/nifi/util/search/SearchTerm.java | 5 +- .../nifi/web/api/dto/BulletinBoardDTO.java | 3 +- .../apache/nifi/web/api/dto/BulletinDTO.java | 7 +- .../nifi/web/api/dto/BulletinQueryDTO.java | 3 +- .../apache/nifi/web/api/dto/ConnectableDTO.java | 6 +- .../apache/nifi/web/api/dto/ConnectionDTO.java | 25 +- .../web/api/dto/ControllerConfigurationDTO.java | 6 +- .../apache/nifi/web/api/dto/ControllerDTO.java | 17 +- .../nifi/web/api/dto/ControllerServiceDTO.java | 10 +- ...ontrollerServiceReferencingComponentDTO.java | 19 +- .../org/apache/nifi/web/api/dto/CounterDTO.java | 3 +- .../org/apache/nifi/web/api/dto/LabelDTO.java | 1 - .../nifi/web/api/dto/NiFiComponentDTO.java | 3 +- .../org/apache/nifi/web/api/dto/PortDTO.java | 10 +- .../nifi/web/api/dto/ProcessGroupDTO.java | 3 +- .../nifi/web/api/dto/ProcessorConfigDTO.java | 32 +-- .../apache/nifi/web/api/dto/ProcessorDTO.java | 10 +- .../nifi/web/api/dto/PropertyDescriptorDTO.java | 22 +- .../nifi/web/api/dto/RemoteProcessGroupDTO.java | 15 +- .../web/api/dto/RemoteProcessGroupPortDTO.java | 3 +- .../nifi/web/api/dto/ReportingTaskDTO.java | 19 +- .../apache/nifi/web/api/dto/RevisionDTO.java | 11 +- .../org/apache/nifi/web/api/dto/SnippetDTO.java | 48 ++-- .../org/apache/nifi/web/api/dto/UserDTO.java | 3 +- .../web/api/dto/provenance/ProvenanceDTO.java | 3 +- .../api/dto/provenance/ProvenanceEventDTO.java | 35 +-- .../provenance/lineage/LineageRequestDTO.java | 7 +- .../provenance/lineage/ProvenanceNodeDTO.java | 3 +- .../web/api/dto/status/ControllerStatusDTO.java | 3 +- .../nifi/web/api/dto/status/PortStatusDTO.java | 6 +- .../api/dto/status/ProcessGroupStatusDTO.java | 9 +- .../web/api/dto/status/ProcessorStatusDTO.java | 9 +- .../dto/status/RemoteProcessGroupStatusDTO.java | 6 +- .../apache/nifi/web/api/entity/AboutEntity.java | 4 +- .../nifi/web/api/entity/ActionEntity.java | 4 +- .../nifi/web/api/entity/AuthorityEntity.java | 4 +- .../nifi/web/api/entity/BannerEntity.java | 4 +- .../web/api/entity/BulletinBoardEntity.java | 4 +- .../entity/ClusterConnectionStatusEntity.java | 4 +- .../nifi/web/api/entity/ClusterEntity.java | 4 +- .../web/api/entity/ClusterPortStatusEntity.java | 4 +- .../entity/ClusterProcessGroupStatusEntity.java | 4 +- .../entity/ClusterProcessorStatusEntity.java | 4 +- .../ClusterRemoteProcessGroupStatusEntity.java | 5 +- .../api/entity/ClusterSearchResultsEntity.java | 4 +- .../web/api/entity/ClusterStatusEntity.java | 4 +- .../api/entity/ClusterStatusHistoryEntity.java | 4 +- .../web/api/entity/ComponentHistoryEntity.java | 4 +- .../nifi/web/api/entity/ConnectionEntity.java | 4 +- .../nifi/web/api/entity/ConnectionsEntity.java | 4 +- .../entity/ControllerConfigurationEntity.java | 4 +- .../nifi/web/api/entity/ControllerEntity.java | 4 +- .../web/api/entity/ControllerServiceEntity.java | 4 +- ...ollerServiceReferencingComponentsEntity.java | 8 +- .../entity/ControllerServiceTypesEntity.java | 4 +- .../api/entity/ControllerServicesEntity.java | 4 +- .../web/api/entity/ControllerStatusEntity.java | 4 +- .../nifi/web/api/entity/CounterEntity.java | 4 +- .../nifi/web/api/entity/CountersEntity.java | 7 +- .../nifi/web/api/entity/FlowSnippetEntity.java | 4 +- .../nifi/web/api/entity/FunnelEntity.java | 4 +- .../nifi/web/api/entity/FunnelsEntity.java | 4 +- .../nifi/web/api/entity/HistoryEntity.java | 4 +- .../nifi/web/api/entity/InputPortEntity.java | 4 +- .../nifi/web/api/entity/InputPortsEntity.java | 4 +- .../apache/nifi/web/api/entity/LabelEntity.java | 4 +- .../nifi/web/api/entity/LabelsEntity.java | 4 +- .../nifi/web/api/entity/LineageEntity.java | 4 +- .../apache/nifi/web/api/entity/NodeEntity.java | 4 +- .../nifi/web/api/entity/NodeStatusEntity.java | 4 +- .../api/entity/NodeSystemDiagnosticsEntity.java | 4 +- .../nifi/web/api/entity/OutputPortEntity.java | 4 +- .../nifi/web/api/entity/OutputPortsEntity.java | 4 +- .../web/api/entity/PrioritizerTypesEntity.java | 4 +- .../nifi/web/api/entity/ProcessGroupEntity.java | 4 +- .../api/entity/ProcessGroupStatusEntity.java | 4 +- .../web/api/entity/ProcessGroupsEntity.java | 4 +- .../nifi/web/api/entity/ProcessorEntity.java | 4 +- .../web/api/entity/ProcessorTypesEntity.java | 4 +- .../nifi/web/api/entity/ProcessorsEntity.java | 4 +- .../api/entity/PropertyDescriptorEntity.java | 4 +- .../web/api/entity/ProvenanceEventEntity.java | 4 +- .../web/api/entity/ProvenanceOptionsEntity.java | 4 +- .../api/entity/RemoteProcessGroupEntity.java | 4 +- .../entity/RemoteProcessGroupPortEntity.java | 4 +- .../api/entity/RemoteProcessGroupsEntity.java | 4 +- .../web/api/entity/ReportingTaskEntity.java | 4 +- .../api/entity/ReportingTaskTypesEntity.java | 4 +- .../web/api/entity/ReportingTasksEntity.java | 4 +- .../web/api/entity/SearchResultsEntity.java | 6 +- .../nifi/web/api/entity/SnippetEntity.java | 4 +- .../web/api/entity/StatusHistoryEntity.java | 4 +- .../web/api/entity/SystemDiagnosticsEntity.java | 4 +- .../nifi/web/api/entity/TemplateEntity.java | 4 +- .../nifi/web/api/entity/TemplatesEntity.java | 4 +- .../apache/nifi/web/api/entity/UserEntity.java | 4 +- .../nifi/web/api/entity/UserGroupEntity.java | 4 +- .../web/api/entity/UserSearchResultsEntity.java | 5 +- .../apache/nifi/web/api/entity/UsersEntity.java | 4 +- .../nifi-file-authorization-provider/pom.xml | 8 + .../FileAuthorizationProvider.java | 90 +------ .../FileAuthorizationProviderTest.java | 63 ++--- .../org/apache/nifi/cluster/event/Event.java | 6 +- .../apache/nifi/cluster/event/EventManager.java | 8 +- .../cluster/event/impl/EventManagerImpl.java | 6 +- .../cluster/firewall/ClusterNodeFirewall.java | 6 +- .../impl/FileBasedClusterNodeFirewall.java | 16 +- .../apache/nifi/cluster/flow/DataFlowDao.java | 3 +- .../cluster/flow/DataFlowManagementService.java | 23 +- .../nifi/cluster/flow/StaleFlowException.java | 3 +- .../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 30 +-- .../impl/DataFlowManagementServiceImpl.java | 19 +- .../nifi/cluster/manager/ClusterManager.java | 100 +++---- .../cluster/manager/HttpClusterManager.java | 111 +++----- .../cluster/manager/HttpRequestReplicator.java | 41 +-- .../cluster/manager/HttpResponseMapper.java | 3 +- .../nifi/cluster/manager/NodeResponse.java | 57 ++-- .../ConnectingNodeMutableRequestException.java | 3 +- ...DisconnectedNodeMutableRequestException.java | 3 +- .../exception/IllegalClusterStateException.java | 3 +- .../exception/IllegalNodeDeletionException.java | 3 +- .../IllegalNodeDisconnectionException.java | 4 +- .../IllegalNodeReconnectionException.java | 3 +- .../IneligiblePrimaryNodeException.java | 3 +- .../exception/MutableRequestException.java | 5 +- .../exception/NoConnectedNodesException.java | 3 +- .../exception/NoResponseFromNodesException.java | 5 +- .../exception/NodeDisconnectionException.java | 3 +- .../PrimaryRoleAssignmentException.java | 3 +- .../SafeModeMutableRequestException.java | 3 +- .../manager/exception/UnknownNodeException.java | 3 +- .../exception/UriConstructionException.java | 4 +- .../manager/impl/HttpRequestReplicatorImpl.java | 42 +-- .../manager/impl/HttpResponseMapperImpl.java | 9 +- .../cluster/manager/impl/WebClusterManager.java | 261 +++++++------------ .../java/org/apache/nifi/cluster/node/Node.java | 40 +-- ...anagerProtocolServiceLocatorFactoryBean.java | 8 +- .../spring/WebClusterManagerFactoryBean.java | 4 +- .../event/impl/EventManagerImplTest.java | 5 +- .../impl/FileBasedClusterNodeFirewallTest.java | 4 +- .../impl/HttpRequestReplicatorImplTest.java | 5 +- .../impl/HttpResponseMapperImplTest.java | 6 +- .../cluster/manager/testutils/HttpRequest.java | 7 +- .../cluster/manager/testutils/HttpResponse.java | 3 +- .../manager/testutils/HttpResponseAction.java | 4 +- .../cluster/manager/testutils/HttpServer.java | 3 +- .../ClusterManagerProtocolSenderImplTest.java | 6 +- .../impl/ClusterServiceLocatorTest.java | 6 +- .../impl/ClusterServicesBroadcasterTest.java | 3 +- .../impl/MulticastProtocolListenerTest.java | 2 +- .../impl/NodeProtocolSenderImplTest.java | 3 +- .../impl/SocketProtocolListenerTest.java | 3 +- .../apache/nifi/cluster/HeartbeatPayload.java | 3 +- .../org/apache/nifi/connectable/LocalPort.java | 5 +- .../nifi/connectable/StandardConnection.java | 10 +- .../nifi/controller/FileSystemSwapManager.java | 6 +- .../apache/nifi/controller/FlowController.java | 214 +++++---------- .../controller/FlowSerializationException.java | 3 +- .../apache/nifi/controller/FlowSerializer.java | 3 +- .../FlowSynchronizationException.java | 3 +- .../nifi/controller/FlowSynchronizer.java | 25 +- .../nifi/controller/FlowUnmarshaller.java | 4 +- .../controller/StandardFlowSynchronizer.java | 12 +- .../nifi/controller/StandardProcessorNode.java | 64 ++--- .../apache/nifi/controller/TemplateManager.java | 19 +- .../controller/UninheritableFlowException.java | 3 +- .../repository/FileSystemRepository.java | 4 +- .../controller/repository/ProcessContext.java | 18 +- .../repository/ProvenanceEventEnricher.java | 3 +- .../repository/RepositoryPurgeException.java | 3 +- .../repository/StandardFlowFileRecord.java | 7 +- .../repository/StandardProcessSession.java | 34 +-- .../repository/StandardProvenanceReporter.java | 6 +- .../repository/StandardRepositoryRecord.java | 3 +- .../StandardRepositoryStatusReport.java | 12 +- .../repository/VolatileContentRepository.java | 30 +-- .../repository/VolatileFlowFileRepository.java | 4 +- .../WriteAheadFlowFileRepository.java | 25 +- .../repository/claim/ContentDirection.java | 9 +- .../repository/claim/StandardContentClaim.java | 7 +- .../io/DisableOnCloseInputStream.java | 4 +- .../io/DisableOnCloseOutputStream.java | 4 +- .../io/FlowFileAccessInputStream.java | 11 +- .../io/FlowFileAccessOutputStream.java | 9 +- .../controller/repository/io/LongHolder.java | 6 +- .../scheduling/ConnectableProcessContext.java | 3 +- .../controller/scheduling/ScheduleState.java | 12 +- .../scheduling/StandardProcessScheduler.java | 18 +- .../StandardControllerServiceProvider.java | 6 +- .../status/history/StandardStatusSnapshot.java | 2 +- .../tasks/ContinuallyRunConnectableTask.java | 4 +- .../tasks/ContinuallyRunProcessorTask.java | 4 +- .../nifi/controller/tasks/ExpireFlowFiles.java | 4 +- .../apache/nifi/encrypt/StringEncryptor.java | 12 +- .../java/org/apache/nifi/engine/FlowEngine.java | 16 +- .../nifi/events/VolatileBulletinRepository.java | 5 +- .../nifi/fingerprint/FingerprintFactory.java | 17 +- .../nifi/groups/StandardProcessGroup.java | 13 +- .../org/apache/nifi/lifecycle/LifeCycle.java | 17 +- .../nifi/lifecycle/LifeCycleException.java | 3 +- .../nifi/lifecycle/LifeCycleStartException.java | 4 +- .../nifi/lifecycle/LifeCycleStopException.java | 3 +- .../nifi/persistence/FlowConfigurationDAO.java | 33 +-- .../nifi/processor/StandardProcessContext.java | 3 +- .../nifi/processor/StandardPropertyValue.java | 12 +- .../org/apache/nifi/remote/RemoteNiFiUtils.java | 11 +- .../nifi/remote/StandardRemoteProcessGroup.java | 49 ++-- .../org/apache/nifi/services/FlowService.java | 55 ++-- .../nifi/spring/FlowControllerFactoryBean.java | 4 +- .../spring/StandardFlowServiceFactoryBean.java | 4 +- .../apache/nifi/util/ComponentStatusReport.java | 4 +- .../org/apache/nifi/util/ReflectionUtils.java | 71 ++--- .../java/org/apache/nifi/util/SnippetUtils.java | 6 +- .../apache/nifi/audit/ControllerAuditor.java | 38 ++- .../nifi/audit/ControllerServiceAuditor.java | 93 ++++--- .../org/apache/nifi/audit/FunnelAuditor.java | 33 ++- .../java/org/apache/nifi/audit/NiFiAuditor.java | 8 +- .../java/org/apache/nifi/audit/PortAuditor.java | 45 ++-- .../apache/nifi/audit/ProcessGroupAuditor.java | 42 ++- .../org/apache/nifi/audit/ProcessorAuditor.java | 66 ++--- .../apache/nifi/audit/RelationshipAuditor.java | 72 +++-- .../nifi/audit/RemoteProcessGroupAuditor.java | 56 ++-- .../apache/nifi/audit/ReportingTaskAuditor.java | 64 +++-- .../org/apache/nifi/audit/SnippetAuditor.java | 40 ++- .../IllegalClusterResourceRequestException.java | 3 +- .../nifi/web/StandardNiFiServiceFacade.java | 36 +-- .../StandardNiFiWebConfigurationContext.java | 35 +-- .../apache/nifi/web/StandardNiFiWebContext.java | 8 +- .../nifi/web/api/ApplicationResource.java | 34 ++- .../nifi/web/api/BulletinBoardResource.java | 7 +- .../apache/nifi/web/api/ClusterResource.java | 6 +- .../apache/nifi/web/api/ConnectionResource.java | 80 ++---- .../apache/nifi/web/api/ControllerResource.java | 113 +++----- .../nifi/web/api/ControllerServiceResource.java | 132 ++++------ .../org/apache/nifi/web/api/FunnelResource.java | 43 ++- .../apache/nifi/web/api/HistoryResource.java | 52 ++-- .../apache/nifi/web/api/InputPortResource.java | 48 ++-- .../org/apache/nifi/web/api/LabelResource.java | 46 ++-- .../org/apache/nifi/web/api/NodeResource.java | 20 +- .../apache/nifi/web/api/OutputPortResource.java | 48 ++-- .../nifi/web/api/ProcessGroupResource.java | 155 ++++------- .../apache/nifi/web/api/ProcessorResource.java | 69 ++--- .../apache/nifi/web/api/ProvenanceResource.java | 129 +++------ .../web/api/RemoteProcessGroupResource.java | 99 +++---- .../nifi/web/api/ReportingTaskResource.java | 92 ++----- .../apache/nifi/web/api/SnippetResource.java | 79 +++--- .../nifi/web/api/SystemDiagnosticsResource.java | 4 +- .../apache/nifi/web/api/TemplateResource.java | 38 ++- .../apache/nifi/web/api/UserGroupResource.java | 44 ++-- .../org/apache/nifi/web/api/UserResource.java | 33 +-- .../config/AdministrationExceptionMapper.java | 1 - ...ationCredentialsNotFoundExceptionMapper.java | 3 +- .../web/api/config/ClusterExceptionMapper.java | 1 - .../NoResponseFromNodesExceptionMapper.java | 3 +- .../nifi/web/api/config/ThrowableMapper.java | 1 - .../org/apache/nifi/web/api/dto/DtoFactory.java | 172 ++++++------ .../org/apache/nifi/web/api/package-info.java | 41 +-- .../request/BulletinBoardPatternParameter.java | 3 +- .../nifi/web/api/request/ClientIdParameter.java | 3 +- .../nifi/web/api/request/DateTimeParameter.java | 3 +- .../nifi/web/api/request/DoubleParameter.java | 3 +- .../nifi/web/api/request/IntegerParameter.java | 3 +- .../nifi/web/api/request/LongParameter.java | 3 +- .../ApplicationStartupContextListener.java | 8 +- .../nifi/web/controller/ControllerFacade.java | 162 ++++++------ .../nifi/web/dao/ControllerServiceDAO.java | 3 +- .../java/org/apache/nifi/web/dao/PortDAO.java | 2 +- .../apache/nifi/web/dao/ProcessGroupDAO.java | 11 +- .../org/apache/nifi/web/dao/ProcessorDAO.java | 3 +- .../nifi/web/dao/RemoteProcessGroupDAO.java | 4 +- .../apache/nifi/web/dao/ReportingTaskDAO.java | 11 +- .../org/apache/nifi/web/dao/SnippetDAO.java | 3 +- .../org/apache/nifi/web/dao/TemplateDAO.java | 17 +- .../apache/nifi/web/dao/impl/ComponentDAO.java | 21 +- .../web/dao/impl/StandardConnectionDAO.java | 48 ---- .../dao/impl/StandardControllerServiceDAO.java | 67 +---- .../nifi/web/dao/impl/StandardFunnelDAO.java | 48 ---- .../nifi/web/dao/impl/StandardInputPortDAO.java | 41 --- .../nifi/web/dao/impl/StandardLabelDAO.java | 48 ---- .../web/dao/impl/StandardOutputPortDAO.java | 41 --- .../web/dao/impl/StandardProcessGroupDAO.java | 34 --- .../nifi/web/dao/impl/StandardProcessorDAO.java | 49 ---- .../dao/impl/StandardRemoteProcessGroupDAO.java | 29 +-- .../web/dao/impl/StandardReportingTaskDAO.java | 63 +---- .../nifi/web/dao/impl/StandardSnippetDAO.java | 43 --- .../nifi/web/filter/NodeRequestFilter.java | 21 +- .../org/apache/nifi/web/util/Availability.java | 3 +- .../org/apache/nifi/web/util/SnippetUtils.java | 12 +- .../apache/nifi/integration/NiFiWebApiTest.java | 27 -- .../accesscontrol/AdminAccessControlTest.java | 162 +++--------- .../accesscontrol/DfmAccessControlTest.java | 140 ++-------- .../ReadOnlyAccessControlTest.java | 162 +++--------- .../util/NiFiTestAuthorizationProvider.java | 36 +-- .../nifi/integration/util/NiFiTestServer.java | 7 +- .../nifi/integration/util/NiFiTestUser.java | 88 ++++--- .../nifi/web/docs/DocumentationController.java | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 17 -- .../org/apache/nifi/processors/GeoEnrichIP.java | 14 +- .../nifi/processors/maxmind/DatabaseReader.java | 40 +-- 329 files changed, 2277 insertions(+), 4857 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3e767fbd/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3e767fbd/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java ----------------------------------------------------------------------
