[nifi] branch main updated (f27cd01 -> 77cf9a1)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.


    from f27cd01  NIFI-9035 Refactored isKeystoreValid() to avoid NullPointerException
     add 77cf9a1  NIFI-8671 Create nifi-versioned-components module. (#5145)

No new revisions were added by this update.

Summary of changes:
 .../registry/NiFiRegConfigSchemaFunction.java      |  2 +-
 .../registry/NiFiRegConnectionSchemaFunction.java  |  2 +-
 .../NiFiRegControllerServiceSchemaFunction.java    |  2 +-
 .../registry/NiFiRegFunnelSchemaFunction.java      |  2 +-
 .../registry/NiFiRegPortSchemaFunction.java        |  2 +-
 .../registry/NiFiRegProcessorSchemaFunction.java   |  2 +-
 .../registry/NiFiRegRemotePortSchemaFunction.java  |  2 +-
 .../NiFiRegRemoteProcessGroupSchemaFunction.java   |  4 +-
 .../registry/VersionedProcessGroupEnricher.java    | 16 ++++----
 nifi-api/pom.xml                                   | 25 +++++++++--
 .../main/java/org/apache/nifi}/flow/BatchSize.java |  2 +-
 .../main/java/org/apache/nifi}/flow/Bundle.java    |  2 +-
 .../java/org/apache/nifi}/flow/ComponentType.java  |  2 +-
 .../apache/nifi}/flow/ConnectableComponent.java    |  2 +-
 .../nifi}/flow/ConnectableComponentType.java       |  2 +-
 .../apache/nifi}/flow/ControllerServiceAPI.java    |  2 +-
 .../main/java/org/apache/nifi}/flow/PortType.java  |  2 +-
 .../main/java/org/apache/nifi}/flow/Position.java  |  2 +-
 .../java/org/apache/nifi}/flow/ScheduledState.java |  2 +-
 .../org/apache/nifi}/flow/VersionedComponent.java  |  2 +-
 .../nifi}/flow/VersionedConfigurableComponent.java |  4 +-
 .../org/apache/nifi}/flow/VersionedConnection.java |  2 +-
 .../nifi}/flow/VersionedControllerService.java     |  2 +-
 .../nifi}/flow/VersionedExtensionComponent.java    |  2 +-
 .../nifi}/flow/VersionedFlowCoordinates.java       |  2 +-
 .../org/apache/nifi}/flow/VersionedFunnel.java     |  2 +-
 .../java/org/apache/nifi}/flow/VersionedLabel.java |  2 +-
 .../java/org/apache/nifi}/flow/VersionedPort.java  |  2 +-
 .../apache/nifi}/flow/VersionedProcessGroup.java   |  4 +-
 .../org/apache/nifi}/flow/VersionedProcessor.java  |  2 +-
 .../nifi}/flow/VersionedPropertyDescriptor.java    |  2 +-
 .../nifi}/flow/VersionedRemoteGroupPort.java       |  2 +-
 .../nifi}/flow/VersionedRemoteProcessGroup.java    |  2 +-
 .../nifi}/flow/VersionedResourceCardinality.java   |  2 +-
 .../nifi}/flow/VersionedResourceDefinition.java    |  2 +-
 .../apache/nifi}/flow/VersionedResourceType.java   |  2 +-
 .../apache/nifi/groups/StandardProcessGroup.java   | 34 +++++++--------
 .../nifi/registry/flow/RestBasedFlowRegistry.java  |  2 +
 .../flow/StandardVersionControlInformation.java    |  1 +
 .../mapping/InstantiatedConnectableComponent.java  |  2 +-
 .../mapping/InstantiatedVersionedConnection.java   |  2 +-
 .../InstantiatedVersionedControllerService.java    |  2 +-
 .../flow/mapping/InstantiatedVersionedFunnel.java  |  2 +-
 .../flow/mapping/InstantiatedVersionedLabel.java   |  2 +-
 .../flow/mapping/InstantiatedVersionedPort.java    |  2 +-
 .../mapping/InstantiatedVersionedProcessGroup.java |  2 +-
 .../mapping/InstantiatedVersionedProcessor.java    |  2 +-
 .../InstantiatedVersionedRemoteGroupPort.java      |  2 +-
 .../InstantiatedVersionedRemoteProcessGroup.java   |  2 +-
 .../flow/mapping/NiFiRegistryFlowMapper.java       | 48 +++++++++++-----------
 .../flow/mapping/StandardComparableDataFlow.java   |  2 +-
 .../apache/nifi/util/FlowDifferenceFilters.java    | 16 ++++----
 .../nifi/util/TestFlowDifferenceFilters.java       | 12 +++---
 .../apache/nifi/registry/flow/FlowRegistry.java    |  1 +
 .../registry/flow/VersionControlInformation.java   |  2 +
 .../org/apache/nifi/controller/FlowController.java |  7 ++--
 .../java/org/apache/nifi/util/BundleUtils.java     | 10 ++---
 .../integration/MockSingleFlowRegistryClient.java  |  2 +-
 .../nifi/integration/versioned/ImportFlowIT.java   |  8 ++--
 .../flow/mapping/NiFiRegistryFlowMapperTest.java   | 26 ++++++------
 .../nifi/registry/flow/FlowRegistryUtils.java      |  2 +
 .../org/apache/nifi/web/NiFiServiceFacade.java     |  2 +-
 .../apache/nifi/web/StandardNiFiServiceFacade.java | 44 ++++++++++----------
 .../apache/nifi/web/api/FlowUpdateResource.java    |  2 +-
 .../apache/nifi/web/api/ProcessGroupResource.java  |  2 +-
 .../org/apache/nifi/web/api/VersionsResource.java  |  2 +-
 .../org/apache/nifi/web/api/dto/DtoFactory.java    |  4 +-
 .../nifi/web/controller/ControllerFacade.java      |  2 +-
 .../nifi/web/dao/impl/StandardProcessGroupDAO.java |  2 +-
 .../nifi/web/api/TestProcessGroupResource.java     |  2 +-
 .../apache/nifi/web/api/TestVersionsResource.java  |  2 +-
 .../nifi-registry-data-model/pom.xml               |  5 +++
 .../nifi/registry/flow/VersionedFlowSnapshot.java  |  1 +
 .../flow/TestVersionedRemoteProcessGroup.java      |  1 +
 .../registry/flow/diff/ComparableDataFlow.java     |  2 +-
 .../diff/ConciseEvolvingDifferenceDescriptor.java  |  6 +--
 .../registry/flow/diff/DifferenceDescriptor.java   |  2 +-
 .../flow/diff/EvolvingDifferenceDescriptor.java    |  4 +-
 .../nifi/registry/flow/diff/FlowComparator.java    |  2 +-
 .../nifi/registry/flow/diff/FlowDifference.java    |  2 +-
 .../flow/diff/StandardComparableDataFlow.java      |  2 +-
 .../registry/flow/diff/StandardFlowComparator.java | 24 +++++------
 .../registry/flow/diff/StandardFlowDifference.java |  2 +-
 .../flow/diff/StaticDifferenceDescriptor.java      |  6 +--
 .../serialization/FlowContentSerializer.java       |  2 +-
 .../JacksonVersionedProcessGroupSerializer.java    |  2 +-
 .../serialization/jaxb/JAXBSerializer.java         | 22 +++++++++-
 .../jaxb/JAXBVersionedProcessGroupSerializer.java  |  2 +-
 .../nifi/registry/service/RegistryService.java     |  4 +-
 .../service/alias/RegistryUrlAliasService.java     |  4 +-
 .../nifi/registry/service/mapper/FlowMappings.java |  2 +-
 .../nifi/registry/event/TestEventFactory.java      |  2 +-
 .../serialization/TestFlowContentSerializer.java   |  4 +-
 .../TestJAXBVersionedProcessGroupSerializer.java   |  4 +-
 .../nifi/registry/service/TestRegistryService.java |  4 +-
 .../org/apache/nifi/registry/web/TestRestAPI.java  |  2 +-
 .../nifi/registry/web/api/DBFlowStorageIT.java     |  2 +-
 .../org/apache/nifi/registry/web/api/FlowsIT.java  |  2 +-
 .../registry/web/api/IntegrationTestUtils.java     |  4 +-
 .../nifi/registry/web/api/NoRevisionsIT.java       |  2 +-
 .../web/api/SecureNiFiRegistryClientIT.java        |  2 +-
 .../web/api/UnsecuredNiFiRegistryClientIT.java     |  6 +--
 .../nifi/registry/flow/InMemoryFlowRegistry.java   |  1 +
 .../apache/nifi/stateless/core/RegistryUtil.java   |  4 +-
 .../stateless/engine/StandardStatelessEngine.java  |  4 +-
 .../stateless/flow/StandardDataflowDefinition.java |  8 ++--
 .../apache/nifi/stateless/StatelessSystemIT.java   |  2 +-
 .../nifi/stateless/VersionedFlowBuilder.java       | 30 +++++++-------
 .../stateless/basics/AsyncCommitCallbackIT.java    |  4 +-
 .../stateless/basics/CancelFlowExecutionIT.java    |  4 +-
 .../nifi/stateless/basics/CloneFlowFileIT.java     |  4 +-
 .../nifi/stateless/basics/CreatesFlowFileIT.java   |  4 +-
 .../nifi/stateless/basics/InputOutputIT.java       |  4 +-
 .../apache/nifi/stateless/basics/LoopingIT.java    |  4 +-
 .../apache/nifi/stateless/basics/MergingIT.java    |  4 +-
 .../basics/RequiresAdditionalInputIT.java          |  4 +-
 .../stateless/basics/RollbackOnExceptionIT.java    |  4 +-
 .../apache/nifi/stateless/basics/SplittingIT.java  |  4 +-
 .../nifi/stateless/basics/StateStorageIT.java      |  6 +--
 .../classloader/InstanceClassLoaderIT.java         |  2 +-
 .../StatelessControllerServiceSystemIT.java        |  8 ++--
 .../stateless/parameters/ParameterContextIT.java   |  6 +--
 .../performance/StatelessPerformanceIT.java        |  2 +-
 123 files changed, 334 insertions(+), 282 deletions(-)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/BatchSize.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/Bundle.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/ComponentType.java (97%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/ConnectableComponent.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/ConnectableComponentType.java (96%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/ControllerServiceAPI.java (97%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/PortType.java (95%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/Position.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/ScheduledState.java (95%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedComponent.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedConfigurableComponent.java (91%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedConnection.java (99%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedControllerService.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedExtensionComponent.java (96%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedFlowCoordinates.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedFunnel.java (96%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedLabel.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedPort.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedProcessGroup.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedProcessor.java (99%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedPropertyDescriptor.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedRemoteGroupPort.java (98%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedRemoteProcessGroup.java (99%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedResourceCardinality.java (96%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedResourceDefinition.java (97%)
 rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry => nifi-api/src/main/java/org/apache/nifi}/flow/VersionedResourceType.java (97%)