This is an automated email from the ASF dual-hosted git repository. aldrin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi.git
The following commit(s) were added to refs/heads/master by this push: new b016378 MINIFI-245: Expose content repository implementation configuration new b6ec05d Merge pull request #193 from mattyb149/MINIFI-245 b016378 is described below commit b016378b577d644b06e405e3f7e9398046c0aed8 Author: Matthew Burgess <mattyb...@apache.org> AuthorDate: Wed Jul 1 15:56:48 2020 -0400 MINIFI-245: Expose content repository implementation configuration --- .../minifi/bootstrap/util/ConfigTransformer.java | 2 +- .../bootstrap/util/ConfigTransformerTest.java | 27 ++++- .../src/test/resources/MINIFI-245/config.yml | 96 +++++++--------- .../resources/MINIFI-245/nifi.properties.before | 121 +++++++++++++++++++++ .../commons/schema/ContentRepositorySchema.java | 10 ++ .../src/test/resources/1.5_RPG_Handling.yml | 1 + .../src/test/resources/CsvToJson.yml | 1 + .../test/resources/DecompressionCircularFlow.yml | 1 + .../resources/InvokeHttpMiNiFiTemplateTest.yml | 1 + .../resources/MINIFI-521_1.3_TemplateEncoding.yml | 1 + .../src/test/resources/MultipleRelationships.yml | 1 + .../src/test/resources/MultipleUriRPG.yml | 1 + .../test/resources/NestedControllerServices.yml | 1 + .../test/resources/NoTemplateEncodingVersion.yml | 1 + .../ProcessGroupsAndRemoteProcessGroups.yml | 1 + ...eplaceTextExpressionLanguageCSVReformatting.yml | 1 + .../test/resources/SimpleRPGToLogAttributes.yml | 1 + .../src/test/resources/SimpleTailFileToRPG.yml | 1 + .../src/test/resources/StressTestFramework.yml | 1 + .../test/resources/StressTestFrameworkFunnel.yml | 1 + .../resources/VersionedFlowSnapshot-Simple.yml | 1 + 21 files changed, 215 insertions(+), 57 deletions(-) diff --git a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java index f42d6ce..3609426 100644 --- a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java +++ b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java @@ -223,7 +223,7 @@ public final class ConfigTransformer { orderedProperties.setProperty("nifi.swap.out.period", swapProperties.getOutPeriod()); orderedProperties.setProperty("nifi.swap.out.threads", String.valueOf(swapProperties.getOutThreads())); - orderedProperties.setProperty("nifi.content.repository.implementation", "org.apache.nifi.controller.repository.FileSystemRepository", System.lineSeparator() + "# Content Repository"); + orderedProperties.setProperty("nifi.content.repository.implementation", contentRepoProperties.getContentRepository(), System.lineSeparator() + "# Content Repository"); orderedProperties.setProperty("nifi.content.claim.max.appendable.size", contentRepoProperties.getContentClaimMaxAppendableSize()); orderedProperties.setProperty("nifi.content.claim.max.flow.files", String.valueOf(contentRepoProperties.getContentClaimMaxFlowFiles())); orderedProperties.setProperty("nifi.content.repository.archive.max.retention.period", contentRepoProperties.getContentRepoArchiveMaxRetentionPeriod()); diff --git a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java index 88bc318..ae7ffa7 100644 --- a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java +++ b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformerTest.java @@ -68,8 +68,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.zip.GZIPInputStream; -import static org.apache.nifi.minifi.bootstrap.RunMiNiFiTest.getTestBootstrapProperties; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -693,6 +693,31 @@ public class ConfigTransformerTest { assertEquals(expected.entrySet().stream().collect(Collectors.toMap(Map.Entry<String, Object>::getKey, e -> nullToEmpty(e.getValue()))), properties); } + @Test + public void testContentRepoOverride() throws IOException, ConfigurationChangeException, SchemaLoaderException { + Properties pre216Properties = new Properties(); + try (InputStream pre216PropertiesStream = ConfigTransformerTest.class.getClassLoader().getResourceAsStream("MINIFI-245/nifi.properties.before")) { + pre216Properties.load(pre216PropertiesStream); + } + pre216Properties.setProperty(ConfigTransformer.NIFI_VERSION_KEY, ConfigTransformer.NIFI_VERSION); + + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + try (InputStream configStream = ConfigTransformerTest.class.getClassLoader().getResourceAsStream("MINIFI-245/config.yml")) { + ConfigTransformer.writeNiFiProperties(SchemaLoader.loadConfigSchemaFromYaml(configStream), outputStream); + } + Properties properties = new Properties(); + properties.load(new ByteArrayInputStream(outputStream.toByteArray())); + + for (String name : pre216Properties.stringPropertyNames()) { + // Verify the Content Repo property was overridden + if("nifi.content.repository.implementation".equals(name)) { + assertNotEquals("Property key " + name + " was not overridden.", pre216Properties.getProperty(name), properties.getProperty(name)); + } else { + assertEquals("Property key " + name + " doesn't match.", pre216Properties.getProperty(name), properties.getProperty(name)); + } + } + } + private String getText(Element element, String path) throws XPathExpressionException { return (String) xPathFactory.newXPath().evaluate(path + "/text()", element, XPathConstants.STRING); } diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/1.5_RPG_Handling.yml b/minifi-bootstrap/src/test/resources/MINIFI-245/config.yml similarity index 55% copy from minifi-toolkit/minifi-toolkit-configuration/src/test/resources/1.5_RPG_Handling.yml copy to minifi-bootstrap/src/test/resources/MINIFI-245/config.yml index da5461b..d72f19a 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/1.5_RPG_Handling.yml +++ b/minifi-bootstrap/src/test/resources/MINIFI-245/config.yml @@ -15,7 +15,7 @@ MiNiFi Config Version: 3 Flow Controller: - name: 1.5 RPG Handling + name: MiNiFi Flow comment: '' Core Properties: flow controller graceful shutdown period: 10 sec @@ -23,7 +23,6 @@ Core Properties: administrative yield duration: 30 sec bored yield duration: 10 millis max concurrent threads: 1 - variable registry properties: '' FlowFile Repository: partitions: 256 checkpoint interval: 2 mins @@ -35,39 +34,32 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.VolatileContentRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false - content repository archive max retention period: 12 hours - content repository archive max usage percentage: 50% - content repository archive enabled: false Provenance Repository: provenance rollover time: 1 min - implementation: org.apache.nifi.provenance.MiNiFiPersistentProvenanceRepository - provenance max storage time: 24 hours - provenance max storage size: 1 GB - provenance index shard size: 500 MB - provenance buffer size: 10000 Component Status Repository: buffer size: 1440 snapshot frequency: 1 min Security Properties: - keystore: '' - keystore type: '' - keystore password: '' - key password: '' - truststore: '' - truststore type: '' - truststore password: '' - ssl protocol: '' + keystore: /tmp/ssl/localhost-ks.jks + keystore type: JKS + keystore password: localtest + key password: localtest + truststore: /tmp/ssl/localhost-ts.jks + truststore type: JKS + truststore password: localtest + ssl protocol: TLS Sensitive Props: - key: + key: '' algorithm: PBEWITHMD5AND256BITAES-CBC-OPENSSL provider: BC Processors: -- id: d80d4090-c56d-33ab-0000-000000000000 - name: GenerateFlowFile - class: org.apache.nifi.processors.standard.GenerateFlowFile +- id: 94b8e610-b4ed-3ec9-b26f-c839931bf3e2 + name: TailFile + class: org.apache.nifi.processors.standard.TailFile max concurrent tasks: 1 scheduling strategy: TIMER_DRIVEN scheduling period: 1 sec @@ -76,46 +68,40 @@ Processors: run duration nanos: 0 auto-terminated relationships list: [] Properties: - Batch Size: '1' - Data Format: Text - File Size: 1 kB - Unique FlowFiles: 'false' - character-set: UTF-8 - generate-ff-custom-text: -Controller Services: [] -Process Groups: [] -Input Ports: [] -Output Ports: [] -Funnels: [] + File to Tail: logs/minifi-app.log + Initial Start Position: Beginning of File + Rolling Filename Pattern: minifi-app* Connections: -- id: 89b6b729-aa58-32f5-0000-000000000000 - name: GenerateFlowFile/success/d7c01635-0160-1000-68aa-fd8a4f9d168e - source id: d80d4090-c56d-33ab-0000-000000000000 +- id: f6cef9b0-8982-391c-8d70-76f33917ac12 + name: TailToS2S + source id: 94b8e610-b4ed-3ec9-b26f-c839931bf3e2 source relationship names: - success - destination id: d7c01635-0160-1000-68aa-fd8a4f9d168e - max work queue size: 10000 - max work queue data size: 1 GB - flowfile expiration: 0 sec - queue prioritizer class: '' + destination id: 8644cbcc-a45c-40e0-964d-5e536e2ada61 + max work queue size: 0 + max work queue data size: 1 MB + flowfile expiration: 60 sec + queue prioritizer class: org.apache.nifi.prioritizer.NewestFlowFileFirstPrioritizer Remote Process Groups: -- id: 9abd6b8c-816a-3f66-0000-000000000000 - name: '' - url: http://localhost:8080/nifi +- id: 94b8e610-b4ed-3ec9-b26f-c839931bf3e3 + name: NiFi Flow + url: https://localhost:8090/nifi comment: '' - timeout: 30 sec + timeout: 30 secs yield period: 10 sec - transport protocol: RAW - proxy host: '' - proxy port: '' - proxy user: '' - proxy password: '' - local network interface: '' Input Ports: - - id: d7c01635-0160-1000-68aa-fd8a4f9d168e - name: From instance + - id: 8644cbcc-a45c-40e0-964d-5e536e2ada61 + name: tailed log comment: '' max concurrent tasks: 1 use compression: false - Output Ports: [] -NiFi Properties Overrides: {} +Provenance Reporting: + comment: '' + scheduling strategy: TIMER_DRIVEN + scheduling period: 30 sec + destination url: https://localhost:8090/ + port name: provenance + originating url: http://${hostname(true)}:8081/nifi + use compression: true + timeout: 30 secs + batch size: 1000 diff --git a/minifi-bootstrap/src/test/resources/MINIFI-245/nifi.properties.before b/minifi-bootstrap/src/test/resources/MINIFI-245/nifi.properties.before new file mode 100644 index 0000000..5741bf1 --- /dev/null +++ b/minifi-bootstrap/src/test/resources/MINIFI-245/nifi.properties.before @@ -0,0 +1,121 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Core Properties # + +nifi.version=1.1.0 +nifi.flow.configuration.file=./conf/flow.xml.gz +nifi.flow.configuration.archive.enabled=false +nifi.flow.configuration.archive.dir=./conf/archive/ +nifi.flowcontroller.autoResumeState=true +nifi.flowcontroller.graceful.shutdown.period=10 sec +nifi.flowservice.writedelay.interval=500 ms +nifi.administrative.yield.duration=30 sec +# If a component has no work to do (is "bored"), how long should we wait before checking again for work? +nifi.bored.yield.duration=10 millis + +nifi.authority.provider.configuration.file=./conf/authority-providers.xml +nifi.login.identity.provider.configuration.file=./conf/login-identity-providers.xml +nifi.templates.directory=./conf/templates +nifi.ui.banner.text= +nifi.ui.autorefresh.interval=30 sec +nifi.nar.library.directory=./lib +nifi.nar.working.directory=./work/nar/ +nifi.documentation.working.directory=./work/docs/components + +#################### +# State Management # +#################### +nifi.state.management.configuration.file=./conf/state-management.xml +# The ID of the local state provider +nifi.state.management.provider.local=local-provider + +# H2 Settings +nifi.database.directory=./database_repository +nifi.h2.url.append=;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE + +# FlowFile Repository +nifi.flowfile.repository.implementation=org.apache.nifi.controller.repository.WriteAheadFlowFileRepository +nifi.flowfile.repository.directory=./flowfile_repository +nifi.flowfile.repository.partitions=256 +nifi.flowfile.repository.checkpoint.interval=2 mins +nifi.flowfile.repository.always.sync=false + +nifi.swap.manager.implementation=org.apache.nifi.controller.FileSystemSwapManager +nifi.queue.swap.threshold=20000 +nifi.swap.in.period=5 sec +nifi.swap.in.threads=1 +nifi.swap.out.period=5 sec +nifi.swap.out.threads=4 + +# Content Repository +nifi.content.repository.implementation=org.apache.nifi.controller.repository.FileSystemRepository +nifi.content.claim.max.appendable.size=10 MB +nifi.content.claim.max.flow.files=100 +nifi.content.repository.archive.max.retention.period=12 hours +nifi.content.repository.archive.max.usage.percentage=50% +nifi.content.repository.archive.enabled=false +nifi.content.repository.directory.default=./content_repository +nifi.content.repository.always.sync=false + +# Provenance Repository Properties +nifi.provenance.repository.implementation=org.apache.nifi.provenance.MiNiFiPersistentProvenanceRepository +nifi.provenance.repository.rollover.time=1 min + +# Volatile Provenance Respository Properties +nifi.provenance.repository.buffer.size=10000 + +# Component Status Repository +nifi.components.status.repository.implementation=org.apache.nifi.controller.status.history.VolatileComponentStatusRepository +nifi.components.status.repository.buffer.size=1440 +nifi.components.status.snapshot.frequency=1 min + +# web properties # +nifi.web.war.directory=./lib +nifi.web.http.host= +nifi.web.http.port=8081 +nifi.web.https.host= +nifi.web.https.port= +nifi.web.jetty.working.directory=./work/jetty +nifi.web.jetty.threads=200 + +# security properties # +nifi.sensitive.props.key= +nifi.sensitive.props.algorithm=PBEWITHMD5AND256BITAES-CBC-OPENSSL +nifi.sensitive.props.provider=BC + +nifi.security.keystore=/tmp/ssl/localhost-ks.jks +nifi.security.keystoreType=JKS +nifi.security.keystorePasswd=localtest +nifi.security.keyPasswd=localtest +nifi.security.truststore=/tmp/ssl/localhost-ts.jks +nifi.security.truststoreType=JKS +nifi.security.truststorePasswd=localtest +nifi.security.needClientAuth= +nifi.security.user.credential.cache.duration=24 hours +nifi.security.user.authority.provider=file-provider +nifi.security.user.login.identity.provider= +nifi.security.support.new.account.requests= +# Valid Authorities include: ROLE_MONITOR,ROLE_DFM,ROLE_ADMIN,ROLE_PROVENANCE,ROLE_NIFI +nifi.security.anonymous.authorities= +nifi.security.ocsp.responder.url= +nifi.security.ocsp.responder.certificate= + + +# cluster node properties (only configure for cluster nodes) # +nifi.cluster.is.node=false + +# cluster manager properties (only configure for cluster manager) # +nifi.cluster.is.manager=false diff --git a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ContentRepositorySchema.java b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ContentRepositorySchema.java index 89afafa..55b2d0f 100644 --- a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ContentRepositorySchema.java +++ b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/ContentRepositorySchema.java @@ -29,12 +29,14 @@ import static org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys.CO * */ public class ContentRepositorySchema extends BaseSchema implements WritableSchema { + public static final String CONTENT_REPOSITORY_IMPLEMENTATION = "implementation"; public static final String CONTENT_CLAIM_MAX_APPENDABLE_SIZE_KEY = "content claim max appendable size"; public static final String CONTENT_CLAIM_MAX_FLOW_FILES_KEY = "content claim max flow files"; public static final String CONTENT_REPO_ARCHIVE_ENABLED_KEY = "content repository archive enabled"; public static final String CONTENT_REPO_ARCHIVE_MAX_RETENTION_PERIOD_KEY = "content repository archive max retention period"; public static final String CONTENT_REPO_ARCHIVE_MAX_USAGE_PERCENTAGE_KEY = "content repository archive max usage percentage"; + public static final String DEFAULT_CONTENT_REPOSITORY_IMPLEMENTATION = "org.apache.nifi.controller.repository.FileSystemRepository"; public static final String DEFAULT_CONTENT_CLAIM_MAX_APPENDABLE_SIZE = "10 MB"; public static final int DEFAULT_CONTENT_CLAIM_MAX_FLOW_FILES = 100; public static final boolean DEFAULT_CONTENT_REPO_ARCHIVE_ENABLED = false; @@ -42,6 +44,7 @@ public class ContentRepositorySchema extends BaseSchema implements WritableSchem public static final String DEFAULT_CONTENT_REPO_ARCHIVE_MAX_USAGE_PERCENTAGE = "50%"; public static final boolean DEFAULT_ALWAYS_SYNC = false; + private String contentRepository = DEFAULT_CONTENT_REPOSITORY_IMPLEMENTATION; private String contentClaimMaxAppendableSize = DEFAULT_CONTENT_CLAIM_MAX_APPENDABLE_SIZE; private Number contentClaimMaxFlowFiles = DEFAULT_CONTENT_CLAIM_MAX_FLOW_FILES; private Boolean contentRepoArchiveEnabled = DEFAULT_CONTENT_REPO_ARCHIVE_ENABLED; @@ -54,6 +57,8 @@ public class ContentRepositorySchema extends BaseSchema implements WritableSchem } public ContentRepositorySchema(Map map) { + contentRepository = getOptionalKeyAsType(map, CONTENT_REPOSITORY_IMPLEMENTATION, String.class, + CONTENT_REPO_KEY, DEFAULT_CONTENT_REPOSITORY_IMPLEMENTATION); contentClaimMaxAppendableSize = getOptionalKeyAsType(map, CONTENT_CLAIM_MAX_APPENDABLE_SIZE_KEY, String.class, CONTENT_REPO_KEY, DEFAULT_CONTENT_CLAIM_MAX_APPENDABLE_SIZE); contentClaimMaxFlowFiles = getOptionalKeyAsType(map, CONTENT_CLAIM_MAX_FLOW_FILES_KEY, Number.class, @@ -70,6 +75,7 @@ public class ContentRepositorySchema extends BaseSchema implements WritableSchem @Override public Map<String, Object> toMap() { Map<String, Object> result = mapSupplier.get(); + result.put(CONTENT_REPOSITORY_IMPLEMENTATION, contentRepository); result.put(CONTENT_CLAIM_MAX_APPENDABLE_SIZE_KEY, contentClaimMaxAppendableSize); result.put(CONTENT_CLAIM_MAX_FLOW_FILES_KEY, contentClaimMaxFlowFiles); result.put(CONTENT_REPO_ARCHIVE_ENABLED_KEY, contentRepoArchiveEnabled); @@ -79,6 +85,10 @@ public class ContentRepositorySchema extends BaseSchema implements WritableSchem return result; } + public String getContentRepository() { + return contentRepository; + } + public String getContentClaimMaxAppendableSize() { return contentClaimMaxAppendableSize; } diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/1.5_RPG_Handling.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/1.5_RPG_Handling.yml index da5461b..10add1e 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/1.5_RPG_Handling.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/1.5_RPG_Handling.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml index 138cc50..d42e20c 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml index 71e7d03..d8872dc 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml index 43c4e98..c799ae4 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MINIFI-521_1.3_TemplateEncoding.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MINIFI-521_1.3_TemplateEncoding.yml index c0ae407..a1bceec 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MINIFI-521_1.3_TemplateEncoding.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MINIFI-521_1.3_TemplateEncoding.yml @@ -34,6 +34,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml index 2f5cbbe..1c263fa 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleUriRPG.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleUriRPG.yml index 9af9237..39fea93 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleUriRPG.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleUriRPG.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NestedControllerServices.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NestedControllerServices.yml index 3a8ea92..6c34ed0 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NestedControllerServices.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NestedControllerServices.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NoTemplateEncodingVersion.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NoTemplateEncodingVersion.yml index 35cf9ac..c6933f5 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NoTemplateEncodingVersion.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/NoTemplateEncodingVersion.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml index 4c8a3f5..234dee5 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml index b48c6e7..098e109 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleRPGToLogAttributes.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleRPGToLogAttributes.yml index c5c4f9f..8e59fb0 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleRPGToLogAttributes.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleRPGToLogAttributes.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml index 35cf9ac..c6933f5 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml index 16e57c1..c9cba9f 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml index 286671d..90e4d2c 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/VersionedFlowSnapshot-Simple.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/VersionedFlowSnapshot-Simple.yml index d4986dd..fe0c02f 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/VersionedFlowSnapshot-Simple.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/VersionedFlowSnapshot-Simple.yml @@ -35,6 +35,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: + implementation: org.apache.nifi.controller.repository.FileSystemRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false