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 2021/12/22 15:48:41 UTC
[nifi] branch main updated (0d49371 -> d6efc69)
This is an automated email from the ASF dual-hosted git repository.
mattyb149 pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from 0d49371 NIFI-7371 Added FlowFile attributes for exceptions in S3 processors
add d6efc69 NIFI-9502 Move extension manifest model and parser out of nifi-registry and into common modules
No new revisions were added by this update.
Summary of changes:
.../pom.xml | 38 +++++++++++------
.../nifi/extension}/manifest/AllowableValue.java | 2 +-
.../apache/nifi/extension}/manifest/Attribute.java | 2 +-
.../apache/nifi/extension}/manifest/BuildInfo.java | 2 +-
.../nifi/extension}/manifest/Cardinality.java | 2 +-
.../manifest/ControllerServiceDefinition.java | 2 +-
.../nifi/extension}/manifest/DefaultSchedule.java | 2 +-
.../nifi/extension}/manifest/DefaultSettings.java | 2 +-
.../nifi/extension}/manifest/Dependency.java | 2 +-
.../nifi/extension}/manifest/DependentValues.java | 2 +-
.../extension}/manifest/DeprecationNotice.java | 2 +-
.../nifi/extension}/manifest/DynamicProperty.java | 2 +-
.../extension}/manifest/DynamicRelationship.java | 2 +-
.../manifest/ExpressionLanguageScope.java | 2 +-
.../apache/nifi/extension}/manifest/Extension.java | 2 +-
.../extension}/manifest/ExtensionManifest.java | 2 +-
.../nifi/extension}/manifest/ExtensionType.java | 2 +-
.../nifi/extension}/manifest/InputRequirement.java | 2 +-
.../apache/nifi/extension}/manifest/ParentNar.java | 2 +-
.../apache/nifi/extension}/manifest/Property.java | 2 +-
.../extension}/manifest/ProvidedServiceAPI.java | 2 +-
.../nifi/extension}/manifest/Relationship.java | 2 +-
.../extension}/manifest/ResourceDefinition.java | 2 +-
.../nifi/extension}/manifest/ResourceType.java | 2 +-
.../nifi/extension}/manifest/Restricted.java | 2 +-
.../nifi/extension}/manifest/Restriction.java | 2 +-
.../org/apache/nifi/extension}/manifest/Scope.java | 2 +-
.../apache/nifi/extension}/manifest/Stateful.java | 2 +-
.../manifest/SystemResourceConsideration.java | 2 +-
.../pom.xml | 16 +++----
.../parser/ExtensionManifestException.java} | 17 ++++----
.../manifest/parser}/ExtensionManifestParser.java | 4 +-
.../jackson}/JacksonExtensionManifestParser.java | 9 ++--
.../TestJacksonExtensionManifestParser.java | 49 +++++++++++-----------
.../manifests}/extension-manifest-ambari-nar.xml | 14 +++++++
.../extension-manifest-dbcp-service-nar.xml | 14 +++++++
.../manifests}/extension-manifest-hadoop-nar.xml | 14 +++++++
.../extension-manifest-kafka-2-6-nar.xml | 14 +++++++
.../extension-manifest-missing-sys-api.xml} | 22 ++--------
.../extension-manifest-test-components.xml | 14 +++++++
.../extension-manifest-unknown-property.xml} | 33 +++++++--------
nifi-manifest/nifi-runtime-manifest-core/pom.xml | 13 ++++--
.../manifest/ExtensionManifestProvider.java | 2 +-
.../runtime/manifest/RuntimeManifestBuilder.java | 2 +-
.../impl/DirectoryExtensionManifestProvider.java | 4 +-
.../manifest/impl/RuntimeManifestGenerator.java | 4 +-
.../impl/StandardRuntimeManifestBuilder.java | 36 ++++++++--------
nifi-manifest/pom.xml | 2 +
.../nifi-registry-bundle-utils/pom.xml | 6 +--
.../bundle/extract/nar/NarBundleExtractor.java | 6 +--
.../nifi/registry/bundle/model/BundleDetails.java | 2 +-
.../extension-manifest-missing-sys-api.xml | 4 --
.../extension-manifest-unknown-property.xml | 15 -------
.../nifi/registry/client/BundleVersionClient.java | 4 +-
.../nifi/registry/client/ExtensionClient.java | 8 ++--
.../nifi/registry/client/ExtensionRepoClient.java | 2 +-
.../client/impl/JerseyBundleVersionClient.java | 4 +-
.../client/impl/JerseyExtensionClient.java | 10 ++---
.../client/impl/JerseyExtensionRepoClient.java | 2 +-
.../nifi-registry-data-model/pom.xml | 5 +++
.../extension/component/ExtensionFilterParams.java | 4 +-
.../extension/component/ExtensionMetadata.java | 10 ++---
.../component/ExtensionMetadataContainer.java | 2 +-
.../registry/extension/component/TagCount.java | 2 +-
.../repo/ExtensionRepoExtensionMetadata.java | 2 +-
.../nifi/registry/db/DatabaseMetadataService.java | 6 +--
.../nifi/registry/db/entity/ExtensionEntity.java | 2 +-
.../db/mapper/ExtensionEntityRowMapper.java | 2 +-
.../serialization/ExtensionSerializer.java | 2 +-
.../jackson/JacksonExtensionSerializer.java | 2 +-
.../nifi/registry/service/MetadataService.java | 4 +-
.../service/extension/ExtensionService.java | 10 ++---
.../extension/StandardExtensionService.java | 10 ++---
.../service/extension/docs/ExtensionDocWriter.java | 4 +-
.../extension/docs/HtmlExtensionDocWriter.java | 28 ++++++-------
.../registry/service/mapper/ExtensionMappings.java | 10 ++---
.../registry/GenerateExtensionManifestSchema.java | 2 +-
.../registry/db/TestDatabaseMetadataService.java | 6 +--
.../serialization/TestExtensionSerializer.java | 2 +-
.../extension/docs/TestHtmlExtensionDocWriter.java | 4 +-
.../nifi/registry/web/api/BundleResource.java | 6 +--
.../registry/web/api/ExtensionRepoResource.java | 6 +--
.../nifi/registry/web/api/ExtensionResource.java | 12 +++---
.../apache/nifi/registry/web/link/LinkService.java | 2 +-
.../nifi/registry/web/service/ServiceFacade.java | 10 ++---
.../web/service/StandardServiceFacade.java | 10 ++---
.../web/api/UnsecuredNiFiRegistryClientIT.java | 14 +++----
.../nifi/registry/web/link/TestLinkService.java | 2 +-
.../registry/extension/ListExtensionTags.java | 2 +-
.../command/registry/extension/ListExtensions.java | 8 ++--
.../result/registry/ExtensionMetadataResult.java | 2 +-
.../cli/impl/result/registry/TagCountResult.java | 2 +-
92 files changed, 345 insertions(+), 290 deletions(-)
copy nifi-manifest/{nifi-runtime-manifest-core => nifi-extension-manifest-model}/pom.xml (61%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/AllowableValue.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Attribute.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/BuildInfo.java (97%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Cardinality.java (94%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ControllerServiceDefinition.java (97%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/DefaultSchedule.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/DefaultSettings.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Dependency.java (97%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/DependentValues.java (95%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/DeprecationNotice.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/DynamicProperty.java (97%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/DynamicRelationship.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ExpressionLanguageScope.java (94%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Extension.java (99%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ExtensionManifest.java (98%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ExtensionType.java (93%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/InputRequirement.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ParentNar.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Property.java (98%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ProvidedServiceAPI.java (97%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Relationship.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ResourceDefinition.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/ResourceType.java (95%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Restricted.java (97%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Restriction.java (97%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Scope.java (93%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/Stateful.java (96%)
rename {nifi-registry/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/component => nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension}/manifest/SystemResourceConsideration.java (96%)
copy nifi-manifest/{nifi-runtime-manifest-core => nifi-extension-manifest-parser}/pom.xml (75%)
copy nifi-manifest/{nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/ExtensionManifestProvider.java => nifi-extension-manifest-parser/src/main/java/org/apache/nifi/extension/manifest/parser/ExtensionManifestException.java} (72%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/main/java/org/apache/nifi/registry/bundle/extract/nar/docs => nifi-manifest/nifi-extension-manifest-parser/src/main/java/org/apache/nifi/extension/manifest/parser}/ExtensionManifestParser.java (88%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/main/java/org/apache/nifi/registry/bundle/extract/nar/docs => nifi-manifest/nifi-extension-manifest-parser/src/main/java/org/apache/nifi/extension/manifest/parser/jackson}/JacksonExtensionManifestParser.java (83%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/java/org/apache/nifi/registry/bundle/extract/nar/docs => nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jackson}/TestJacksonExtensionManifestParser.java (89%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/resources/descriptors => nifi-manifest/nifi-extension-manifest-parser/src/test/resources/manifests}/extension-manifest-ambari-nar.xml (85%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/resources/descriptors => nifi-manifest/nifi-extension-manifest-parser/src/test/resources/manifests}/extension-manifest-dbcp-service-nar.xml (95%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/resources/descriptors => nifi-manifest/nifi-extension-manifest-parser/src/test/resources/manifests}/extension-manifest-hadoop-nar.xml (99%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/resources/descriptors => nifi-manifest/nifi-extension-manifest-parser/src/test/resources/manifests}/extension-manifest-kafka-2-6-nar.xml (99%)
copy nifi-manifest/{pom.xml => nifi-extension-manifest-parser/src/test/resources/manifests/extension-manifest-missing-sys-api.xml} (52%)
rename {nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/resources/descriptors => nifi-manifest/nifi-extension-manifest-parser/src/test/resources/manifests}/extension-manifest-test-components.xml (77%)
copy nifi-manifest/{pom.xml => nifi-extension-manifest-parser/src/test/resources/manifests/extension-manifest-unknown-property.xml} (52%)
delete mode 100644 nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/resources/descriptors/extension-manifest-missing-sys-api.xml
delete mode 100644 nifi-registry/nifi-registry-core/nifi-registry-bundle-utils/src/test/resources/descriptors/extension-manifest-unknown-property.xml