This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 87f1487136 NIFI-15506 Replaced mock Processor classes for Controller
Services NoOpProcessor (#10814)
87f1487136 is described below
commit 87f1487136afe25fab58e1bc7f5883ab98c86e3d
Author: dan-s1 <[email protected]>
AuthorDate: Tue Jan 27 11:25:34 2026 -0500
NIFI-15506 Replaced mock Processor classes for Controller Services
NoOpProcessor (#10814)
Signed-off-by: David Handermann <[email protected]>
---
.../provider/service/MockAWSProcessor.java | 71 ----------------------
...entialsProviderControllerServiceStrategies.java | 5 +-
.../TestControllerServiceProcessor.java | 52 ----------------
.../integration/AbstractElasticsearch_IT.java | 5 +-
.../integration/ElasticSearchLookupService_IT.java | 3 -
.../unit/ElasticSearchClientServiceImplTest.java | 5 +-
.../unit/ElasticSearchLookupServiceTest.java | 6 +-
.../unit/ElasticSearchStringLookupServiceTest.java | 6 +-
.../jms/cf/JMSConnectionFactoryProviderTest.java | 71 +++-------------------
.../nifi/mongodb/MongoDBControllerServiceIT.java | 7 ++-
.../nifi/mongodb/MongoDBControllerServiceTest.java | 17 +++---
.../nifi/mongodb/MongoDBLookupServiceIT.java | 4 +-
.../mongodb/TestControllerServiceProcessor.java | 48 ---------------
.../nifi/mongodb/TestLookupServiceProcessor.java | 48 ---------------
.../standard/StandardPGPPrivateKeyServiceTest.java | 6 +-
.../standard/StandardPGPPublicKeyServiceTest.java | 6 +-
.../cache/server/map/MapCacheServiceTlsTest.java | 4 +-
.../distributed/cache/server/map/MapCacheTest.java | 5 +-
.../map/TestDistributedMapServerAndClient.java | 4 +-
.../cache/server/set/SetCacheServiceTest.java | 5 +-
.../set/TestDistributedSetServerAndClient.java | 5 +-
.../nifi/lookup/TestCSVRecordLookupService.java | 3 +-
.../java/org/apache/nifi/lookup/TestProcessor.java | 46 --------------
.../lookup/TestPropertiesFileLookupService.java | 10 +--
.../lookup/TestSimpleCsvFileLookupService.java | 6 +-
.../lookup/TestSimpleKeyValueLookupService.java | 3 +-
.../nifi/lookup/TestXMLFileLookupService.java | 8 +--
.../nifi/lookup/maxmind/TestIPLookupService.java | 4 +-
.../org/apache/nifi/lookup/TestReaderLookup.java | 8 +--
.../nifi/lookup/TestRecordSetWriterLookup.java | 28 +++++----
.../serialization/TestRecordReaderProcessor.java | 45 --------------
.../TestRecordSetWriterProcessor.java | 45 --------------
.../nifi/record/sink/TestEmailRecordSink.java | 3 +-
.../nifi/record/sink/TestLoggingRecordSink.java | 3 +-
.../org/apache/nifi/record/sink/TestProcessor.java | 45 --------------
.../sink/lookup/TestRecordSinkServiceLookup.java | 5 +-
.../websocket/jetty/TestJettyWebSocketClient.java | 5 +-
37 files changed, 92 insertions(+), 558 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/MockAWSProcessor.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/MockAWSProcessor.java
deleted file mode 100644
index 2f243d06c5..0000000000
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/MockAWSProcessor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.processors.aws.credentials.provider.service;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processors.aws.AbstractAwsSyncProcessor;
-import software.amazon.awssdk.services.s3.S3Client;
-import software.amazon.awssdk.services.s3.S3ClientBuilder;
-
-import java.util.List;
-
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_ARN;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_EXTERNAL_ID;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_NAME;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_PROXY_CONFIGURATION_SERVICE;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_STS_ENDPOINT;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.ASSUME_ROLE_STS_REGION;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.MAX_SESSION_TIME;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.PROFILE_NAME;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.USE_ANONYMOUS_CREDENTIALS;
-import static
org.apache.nifi.processors.aws.credentials.provider.service.AWSCredentialsProviderControllerService.USE_DEFAULT_CREDENTIALS;
-
-/**
- * Mock Processor implementation used to test CredentialsProviderFactory.
- */
-public class MockAWSProcessor extends AbstractAwsSyncProcessor<S3Client,
S3ClientBuilder> {
-
- public static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS =
List.of(
- USE_DEFAULT_CREDENTIALS,
- PROFILE_NAME,
- USE_ANONYMOUS_CREDENTIALS,
- ASSUME_ROLE_ARN,
- ASSUME_ROLE_NAME,
- MAX_SESSION_TIME,
- ASSUME_ROLE_EXTERNAL_ID,
- ASSUME_ROLE_PROXY_CONFIGURATION_SERVICE,
- ASSUME_ROLE_STS_REGION,
- ASSUME_ROLE_STS_ENDPOINT
- );
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- return PROPERTY_DESCRIPTORS;
- }
-
- @Override
- public void onTrigger(final ProcessContext context, final ProcessSession
session) {
-
- }
-
- @Override
- protected S3ClientBuilder createClientBuilder(ProcessContext context) {
- return null;
- }
-}
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/TestAWSCredentialsProviderControllerServiceStrategies.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/TestAWSCredentialsProviderControllerServiceStrategies.java
index acc5929cbb..9b7c4a63ee 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/TestAWSCredentialsProviderControllerServiceStrategies.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/credentials/provider/service/TestAWSCredentialsProviderControllerServiceStrategies.java
@@ -18,6 +18,7 @@ package
org.apache.nifi.processors.aws.credentials.provider.service;
import
org.apache.nifi.processors.aws.credentials.provider.PropertiesCredentialsProvider;
import org.apache.nifi.reporting.InitializationException;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -37,7 +38,7 @@ public class
TestAWSCredentialsProviderControllerServiceStrategies {
@BeforeEach
public void setup() throws InitializationException {
- runner = TestRunners.newTestRunner(MockAWSProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
service = new AWSCredentialsProviderControllerService();
runner.addControllerService("auth", service);
}
@@ -70,7 +71,7 @@ public class
TestAWSCredentialsProviderControllerServiceStrategies {
}
@Test
- public void testAssumeRoleCredentials() throws Throwable {
+ public void testAssumeRoleCredentials() {
runner.setProperty(service,
AWSCredentialsProviderControllerService.CREDENTIALS_FILE,
"src/test/resources/mock-aws-credentials.properties");
runner.setProperty(service,
AWSCredentialsProviderControllerService.ASSUME_ROLE_ARN, "BogusArn");
runner.setProperty(service,
AWSCredentialsProviderControllerService.ASSUME_ROLE_NAME, "BogusSession");
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/TestControllerServiceProcessor.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/TestControllerServiceProcessor.java
deleted file mode 100644
index d4f166fd93..0000000000
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/TestControllerServiceProcessor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.nifi.elasticsearch;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class TestControllerServiceProcessor extends AbstractProcessor {
-
- public static final PropertyDescriptor CLIENT_SERVICE = new
PropertyDescriptor.Builder()
- .name("Client Service")
- .description("ElasticSearchClientServiceImpl")
- .identifiesControllerService(ElasticSearchClientServiceImpl.class)
- .required(true)
- .build();
- public static final PropertyDescriptor LOOKUP_SERVICE = new
PropertyDescriptor.Builder()
- .name("Lookup Service")
- .description("ElasticSearchClientServiceImpl")
- .identifiesControllerService(ElasticSearchLookupService.class)
- .required(false)
- .build();
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- return Arrays.asList(CLIENT_SERVICE, LOOKUP_SERVICE);
- }
-}
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/AbstractElasticsearch_IT.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/AbstractElasticsearch_IT.java
index 434c830de7..e73e302c32 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/AbstractElasticsearch_IT.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/AbstractElasticsearch_IT.java
@@ -19,7 +19,7 @@ package org.apache.nifi.elasticsearch.integration;
import org.apache.nifi.elasticsearch.AuthorizationScheme;
import org.apache.nifi.elasticsearch.ElasticSearchClientService;
import org.apache.nifi.elasticsearch.ElasticSearchClientServiceImpl;
-import org.apache.nifi.elasticsearch.TestControllerServiceProcessor;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
@@ -35,10 +35,9 @@ abstract class AbstractElasticsearch_IT extends
AbstractElasticsearchITBase {
@BeforeEach
void before() throws Exception {
- runner =
TestRunners.newTestRunner(TestControllerServiceProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
service = new ElasticSearchClientServiceImpl();
runner.addControllerService(CLIENT_SERVICE_NAME, service);
- runner.setProperty(TestControllerServiceProcessor.CLIENT_SERVICE,
CLIENT_SERVICE_NAME);
runner.setProperty(service, ElasticSearchClientService.HTTP_HOSTS,
elasticsearchHost);
runner.setProperty(service,
ElasticSearchClientService.CONNECT_TIMEOUT, "10000");
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.java
index 589e81a444..5b56849067 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchLookupService_IT.java
@@ -17,7 +17,6 @@
package org.apache.nifi.elasticsearch.integration;
import org.apache.nifi.elasticsearch.ElasticSearchLookupService;
-import org.apache.nifi.elasticsearch.TestControllerServiceProcessor;
import org.apache.nifi.elasticsearch.TestSchemaRegistry;
import org.apache.nifi.lookup.LookupFailureException;
import org.apache.nifi.record.path.FieldValue;
@@ -56,8 +55,6 @@ class ElasticSearchLookupService_IT extends
AbstractElasticsearch_IT {
lookupService = new ElasticSearchLookupService();
runner.addControllerService(LOOKUP_SERVICE_NAME, lookupService);
- runner.setProperty(TestControllerServiceProcessor.CLIENT_SERVICE,
CLIENT_SERVICE_NAME);
- runner.setProperty(TestControllerServiceProcessor.LOOKUP_SERVICE,
LOOKUP_SERVICE_NAME);
runner.setProperty(lookupService,
ElasticSearchLookupService.CLIENT_SERVICE, CLIENT_SERVICE_NAME);
runner.setProperty(lookupService, ElasticSearchLookupService.INDEX,
"user_details");
setTypeOnLookupService();
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchClientServiceImplTest.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchClientServiceImplTest.java
index 98fc5cd674..0527ce7eb9 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchClientServiceImplTest.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchClientServiceImplTest.java
@@ -20,10 +20,10 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.elasticsearch.AuthorizationScheme;
import org.apache.nifi.elasticsearch.ElasticSearchClientService;
import org.apache.nifi.elasticsearch.ElasticSearchClientServiceImpl;
-import org.apache.nifi.elasticsearch.TestControllerServiceProcessor;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.ssl.SSLContextProvider;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -45,10 +45,9 @@ class ElasticSearchClientServiceImplTest {
@BeforeEach
void setUp() throws Exception {
- runner =
TestRunners.newTestRunner(TestControllerServiceProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
service = new ElasticSearchClientServiceImpl();
runner.addControllerService("Client Service", service);
- runner.setProperty(TestControllerServiceProcessor.CLIENT_SERVICE,
"Client Service");
runner.setProperty(service, ElasticSearchClientService.HTTP_HOSTS,
HOST);
}
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchLookupServiceTest.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchLookupServiceTest.java
index f536784f34..6ee2d74787 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchLookupServiceTest.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchLookupServiceTest.java
@@ -19,11 +19,11 @@ package org.apache.nifi.elasticsearch.unit;
import org.apache.nifi.elasticsearch.ElasticSearchClientService;
import org.apache.nifi.elasticsearch.ElasticSearchLookupService;
-import org.apache.nifi.elasticsearch.TestControllerServiceProcessor;
import org.apache.nifi.elasticsearch.TestElasticSearchClientService;
import org.apache.nifi.elasticsearch.TestSchemaRegistry;
import org.apache.nifi.schema.access.SchemaAccessUtils;
import org.apache.nifi.serialization.record.Record;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -47,7 +47,7 @@ class ElasticSearchLookupServiceTest {
mockClientService = new TestElasticSearchClientService();
lookupService = new ElasticSearchLookupService();
TestSchemaRegistry registry = new TestSchemaRegistry();
- runner =
TestRunners.newTestRunner(TestControllerServiceProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("clientService", mockClientService);
runner.addControllerService("lookupService", lookupService);
runner.addControllerService("registry", registry);
@@ -55,8 +55,6 @@ class ElasticSearchLookupServiceTest {
runner.enableControllerService(registry);
runner.setProperty(lookupService,
ElasticSearchLookupService.CLIENT_SERVICE, "clientService");
runner.setProperty(lookupService, ElasticSearchLookupService.INDEX,
"users");
- runner.setProperty(TestControllerServiceProcessor.CLIENT_SERVICE,
"clientService");
- runner.setProperty(TestControllerServiceProcessor.LOOKUP_SERVICE,
"lookupService");
runner.setProperty(lookupService, SchemaAccessUtils.SCHEMA_REGISTRY,
"registry");
runner.setProperty(lookupService,
SchemaAccessUtils.SCHEMA_ACCESS_STRATEGY, SchemaAccessUtils.INFER_SCHEMA);
runner.enableControllerService(lookupService);
diff --git
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchStringLookupServiceTest.java
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchStringLookupServiceTest.java
index 7e19c90ca8..835b4acf2d 100644
---
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchStringLookupServiceTest.java
+++
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/unit/ElasticSearchStringLookupServiceTest.java
@@ -20,8 +20,8 @@ package org.apache.nifi.elasticsearch.unit;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.nifi.elasticsearch.ElasticSearchClientService;
import org.apache.nifi.elasticsearch.ElasticSearchStringLookupService;
-import org.apache.nifi.elasticsearch.TestControllerServiceProcessor;
import org.apache.nifi.elasticsearch.TestElasticSearchClientService;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -45,14 +45,12 @@ class ElasticSearchStringLookupServiceTest {
public void setup() throws Exception {
mockClientService = new TestElasticSearchClientService();
lookupService = new ElasticSearchStringLookupService();
- TestRunner runner =
TestRunners.newTestRunner(TestControllerServiceProcessor.class);
+ TestRunner runner = TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("clientService", mockClientService);
runner.addControllerService("lookupService", lookupService);
runner.enableControllerService(mockClientService);
runner.setProperty(lookupService,
ElasticSearchStringLookupService.CLIENT_SERVICE, "clientService");
runner.setProperty(lookupService,
ElasticSearchStringLookupService.INDEX, "users");
- runner.setProperty(TestControllerServiceProcessor.CLIENT_SERVICE,
"clientService");
- runner.setProperty(TestControllerServiceProcessor.LOOKUP_SERVICE,
"lookupService");
runner.enableControllerService(lookupService);
}
diff --git
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java
b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java
index 38294f4e42..8c6578b775 100644
---
a/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java
+++
b/nifi-extension-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java
@@ -17,11 +17,11 @@
package org.apache.nifi.jms.cf;
import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.processor.Processor;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.util.MockComponentLog;
import org.apache.nifi.util.MockConfigurationContext;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -75,19 +75,20 @@ public class JMSConnectionFactoryProviderTest {
private String dummyResource;
private String allDummyResources;
+ private TestRunner runner;
@BeforeEach
public void prepareTest() throws URISyntaxException {
dummyResource = this.getClass().getResource("/" +
DUMMY_JAR_1).toURI().toString();
- allDummyResources = this.getClass().getResource("/" +
DUMMY_JAR_1).toURI().toString() + "," +
- this.getClass().getResource("/" +
DUMMY_JAR_2).toURI().toString() + "," +
- this.getClass().getResource("/" +
DUMMY_CONF).toURI().toString() + ",";
+ allDummyResources = this.getClass().getResource("/" +
DUMMY_JAR_1).toURI() + "," +
+ this.getClass().getResource("/" + DUMMY_JAR_2).toURI() + "," +
+ this.getClass().getResource("/" + DUMMY_CONF).toURI() + ",";
+
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
}
@Test
public void validateNotValidForNonExistingLibPath() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -100,7 +101,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validateELExpression() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
runner.setValidateExpressionUsage(true);
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
@@ -118,7 +118,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void testClientLibResourcesLoaded() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
runner.setValidateExpressionUsage(true);
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
@@ -153,8 +152,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithSingleTestBroker() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -167,8 +164,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithSingleTestBrokerWithScheme() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -181,8 +176,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithMultipleTestBrokers() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -195,8 +188,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithSingleActiveMqBroker() throws InitializationException
{
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -209,8 +200,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithMultipleActiveMqBrokers() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -223,8 +212,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithSingleTibcoBroker() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -237,8 +224,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithMultipleTibcoBrokers() throws InitializationException
{
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -251,8 +236,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithSingleIbmMqBroker() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -265,8 +248,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithMultipleIbmMqBrokers() throws InitializationException
{
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -279,8 +260,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithMultipleIbmMqMixedBrokers() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -293,8 +272,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithMultipleIbmMqColorPairBrokers() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -307,8 +284,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void validWithSingleQpidJmsBroker() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProvider cfProvider = new
JMSConnectionFactoryProvider();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -321,8 +296,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleTestBrokerConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -337,8 +310,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleTestBrokerWithSchemaConnectionFactory()
throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -353,8 +324,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnMultipleTestBrokersConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -369,8 +338,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleActiveMqBrokerConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -385,8 +352,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnMultipleActiveMqBrokersConnectionFactory()
throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -401,8 +366,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleActiveMqBrokerWithSslConnectionFactory()
throws Exception {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -450,8 +413,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleTibcoBrokerConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -466,8 +427,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnMultipleTibcoBrokersConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -482,8 +441,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleIbmMqBrokerConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -498,8 +455,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnMultipleIbmMqBrokersConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -514,8 +469,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnMultipleIbmMqMixedBrokersConnectionFactory()
throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -530,8 +483,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void
propertiesSetOnMultipleIbmMqColonPairBrokersConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -546,8 +497,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void
propertiesSetOnSingleIbmMqColonSeparatedPairBrokerConnectionFactory() throws
InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -562,8 +511,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void dynamicPropertiesSetOnSingleTestBrokerConnectionFactory()
throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -581,8 +528,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleQpidJmsConnectionFactory() throws
Exception {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
@@ -597,8 +542,6 @@ public class JMSConnectionFactoryProviderTest {
@Test
public void propertiesSetOnSingleQpidJmsWithSslConnectionFactory() throws
Exception {
- TestRunner runner = TestRunners.newTestRunner(mock(Processor.class));
-
JMSConnectionFactoryProviderForTest cfProvider = new
JMSConnectionFactoryProviderForTest();
runner.addControllerService(CF_PROVIDER_SERVICE_ID, cfProvider);
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java
index a97890b8de..d19dbd49c5 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceIT.java
@@ -22,6 +22,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.controller.VerifiableControllerService;
import org.apache.nifi.util.MockConfigurationContext;
import org.apache.nifi.util.MockControllerServiceLookup;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterEach;
@@ -43,7 +44,7 @@ public class MongoDBControllerServiceIT extends
AbstractMongoIT {
@BeforeEach
public void before() throws Exception {
- runner =
TestRunners.newTestRunner(TestControllerServiceProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
service = new MongoDBControllerService();
runner.addControllerService(IDENTIFIER, service);
runner.setProperty(service, MongoDBControllerService.URI,
MONGO_CONTAINER.getConnectionString());
@@ -74,7 +75,7 @@ public class MongoDBControllerServiceIT extends
AbstractMongoIT {
);
assertEquals(1, results.size());
- assertEquals(ConfigVerificationResult.Outcome.SUCCESSFUL,
results.get(0).getOutcome());
+ assertEquals(ConfigVerificationResult.Outcome.SUCCESSFUL,
results.getFirst().getOutcome());
}
@Test
@@ -88,6 +89,6 @@ public class MongoDBControllerServiceIT extends
AbstractMongoIT {
);
assertEquals(1, results.size());
- assertEquals(ConfigVerificationResult.Outcome.FAILED,
results.get(0).getOutcome());
+ assertEquals(ConfigVerificationResult.Outcome.FAILED,
results.getFirst().getOutcome());
}
}
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceTest.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceTest.java
index 6d2ad64370..d8ba993bb1 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceTest.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBControllerServiceTest.java
@@ -24,6 +24,7 @@ import com.mongodb.client.internal.MongoClientImpl;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.util.MockConfigurationContext;
import org.apache.nifi.util.MockControllerServiceLookup;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterEach;
@@ -45,7 +46,7 @@ public class MongoDBControllerServiceTest {
@BeforeEach
public void setUp() throws Exception {
- runner =
TestRunners.newTestRunner(TestControllerServiceProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor .class);
service = new MongoDBControllerService();
runner.addControllerService(IDENTIFIER, service);
}
@@ -74,7 +75,7 @@ public class MongoDBControllerServiceTest {
}
@Test
- public void testAllInUri_ScramSha256_WithDatabase() throws Exception {
+ public void testAllInUri_ScramSha256_WithDatabase() {
final String uri =
"mongodb://user1:pass1@localhost:27017/db1?authMechanism=SCRAM-SHA-256";
runner.setProperty(service, MongoDBControllerService.URI, uri);
@@ -87,7 +88,7 @@ public class MongoDBControllerServiceTest {
}
@Test
- public void testAllInUri_X509_WithUserInUri() throws Exception {
+ public void testAllInUri_X509_WithUserInUri() {
final String uri =
"mongodb://CN=uriUser@localhost:27017/?authMechanism=MONGODB-X509";
runner.setProperty(service, MongoDBControllerService.URI, uri);
@@ -101,7 +102,7 @@ public class MongoDBControllerServiceTest {
}
@Test
- public void testUriPlusUser_X509() throws Exception {
+ public void testUriPlusUser_X509() {
final String uri =
"mongodb://localhost:27017/?authMechanism=MONGODB-X509";
runner.setProperty(service, MongoDBControllerService.URI, uri);
@@ -133,7 +134,7 @@ public class MongoDBControllerServiceTest {
}
@Test
- public void testUriPlusUserPassword_ScramSha256() throws Exception {
+ public void testUriPlusUserPassword_ScramSha256() {
final String uri =
"mongodb://localhost:27017/db3?authMechanism=SCRAM-SHA-256";
runner.setProperty(service, MongoDBControllerService.URI, uri);
@@ -148,7 +149,7 @@ public class MongoDBControllerServiceTest {
}
@Test
- public void testUriPlusUserPassword_Plain() throws Exception {
+ public void testUriPlusUserPassword_Plain() {
final String uri =
"mongodb://localhost:27017/mydb?authMechanism=PLAIN";
runner.setProperty(service, MongoDBControllerService.URI, uri);
@@ -163,7 +164,7 @@ public class MongoDBControllerServiceTest {
}
@Test
- public void testUriPlusUserPassword_Aws() throws Exception {
+ public void testUriPlusUserPassword_Aws() {
final String uri =
"mongodb://localhost:27017/?authMechanism=MONGODB-AWS";
runner.setProperty(service, MongoDBControllerService.URI, uri);
@@ -197,7 +198,7 @@ public class MongoDBControllerServiceTest {
}
@Test
- public void testX509_PropertyOverridesUserInUri() throws Exception {
+ public void testX509_PropertyOverridesUserInUri() {
final String uri =
"mongodb://CN=uriPreferred@localhost:27017/?authMechanism=MONGODB-X509";
runner.setProperty(service, MongoDBControllerService.URI, uri);
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java
index fc1bed79d6..da13030806 100644
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java
+++
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/MongoDBLookupServiceIT.java
@@ -27,6 +27,7 @@ import org.apache.nifi.serialization.record.MapRecord;
import org.apache.nifi.serialization.record.Record;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.type.RecordDataType;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.bson.Document;
@@ -64,12 +65,11 @@ public class MongoDBLookupServiceIT extends AbstractMongoIT
{
@BeforeEach
public void before() throws Exception {
- runner = TestRunners.newTestRunner(TestLookupServiceProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
service = new MongoDBLookupService();
controllerService = new MongoDBControllerService();
runner.addControllerService("Client Service", service);
runner.addControllerService("Client Service 2", controllerService);
- runner.setProperty(TestLookupServiceProcessor.CLIENT_SERVICE, "Client
Service");
runner.setProperty(service, MongoDBLookupService.DATABASE_NAME,
DB_NAME);
runner.setProperty(service, MongoDBLookupService.COLLECTION_NAME,
COL_NAME);
runner.setProperty(controllerService, MongoDBControllerService.URI,
MONGO_CONTAINER.getConnectionString());
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java
deleted file mode 100644
index 1305d8c62c..0000000000
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestControllerServiceProcessor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.nifi.mongodb;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestControllerServiceProcessor extends AbstractProcessor {
-
- static final PropertyDescriptor CLIENT_SERVICE = new
PropertyDescriptor.Builder()
- .name("Client Service")
- .description("MongoDBClientService")
- .identifiesControllerService(MongoDBClientService.class)
- .required(true)
- .build();
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- List<PropertyDescriptor> propDescs = new ArrayList<>();
- propDescs.add(CLIENT_SERVICE);
- return propDescs;
- }
-}
diff --git
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java
b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java
deleted file mode 100644
index f8b7f0bc50..0000000000
---
a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-services/src/test/java/org/apache/nifi/mongodb/TestLookupServiceProcessor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.nifi.mongodb;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestLookupServiceProcessor extends AbstractProcessor {
-
- static final PropertyDescriptor CLIENT_SERVICE = new
PropertyDescriptor.Builder()
- .name("Client Service")
- .description("MongoDBLookupService")
- .identifiesControllerService(MongoDBLookupService.class)
- .required(true)
- .build();
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- List<PropertyDescriptor> propDescs = new ArrayList<>();
- propDescs.add(CLIENT_SERVICE);
- return propDescs;
- }
-}
diff --git
a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPrivateKeyServiceTest.java
b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPrivateKeyServiceTest.java
index 09ba09cd57..5793fdeb01 100644
---
a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPrivateKeyServiceTest.java
+++
b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPrivateKeyServiceTest.java
@@ -19,7 +19,7 @@ package org.apche.nifi.pgp.service.standard;
import org.apache.nifi.pgp.service.standard.StandardPGPPrivateKeyService;
import org.apache.nifi.pgp.util.PGPFileUtils;
import org.apache.nifi.pgp.util.PGPSecretKeyGenerator;
-import org.apache.nifi.processor.Processor;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.bouncycastle.openpgp.PGPPrivateKey;
@@ -36,7 +36,6 @@ import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
public class StandardPGPPrivateKeyServiceTest {
private static final String SERVICE_ID =
StandardPGPPrivateKeyService.class.getSimpleName();
@@ -76,8 +75,7 @@ public class StandardPGPPrivateKeyServiceTest {
@BeforeEach
public void setService() {
service = new StandardPGPPrivateKeyService();
- final Processor processor = mock(Processor.class);
- runner = TestRunners.newTestRunner(processor);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPublicKeyServiceTest.java
b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPublicKeyServiceTest.java
index 698573ce7a..f7a2f7e86d 100644
---
a/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPublicKeyServiceTest.java
+++
b/nifi-extension-bundles/nifi-pgp-bundle/nifi-pgp-service/src/test/java/org/apche/nifi/pgp/service/standard/StandardPGPPublicKeyServiceTest.java
@@ -20,7 +20,7 @@ import org.apache.nifi.pgp.service.api.KeyIdentifierConverter;
import org.apache.nifi.pgp.service.standard.StandardPGPPublicKeyService;
import org.apache.nifi.pgp.util.PGPFileUtils;
import org.apache.nifi.pgp.util.PGPSecretKeyGenerator;
-import org.apache.nifi.processor.Processor;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.bouncycastle.openpgp.PGPPublicKey;
@@ -36,7 +36,6 @@ import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
public class StandardPGPPublicKeyServiceTest {
private static final String SERVICE_ID =
StandardPGPPublicKeyService.class.getSimpleName();
@@ -69,8 +68,7 @@ public class StandardPGPPublicKeyServiceTest {
@BeforeEach
public void setService() {
service = new StandardPGPPublicKeyService();
- final Processor processor = mock(Processor.class);
- runner = TestRunners.newTestRunner(processor);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheServiceTlsTest.java
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheServiceTlsTest.java
index 521458806f..5c04c17cf8 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheServiceTlsTest.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheServiceTlsTest.java
@@ -21,11 +21,11 @@ import
org.apache.nifi.distributed.cache.client.Deserializer;
import org.apache.nifi.distributed.cache.client.MapCacheClientService;
import org.apache.nifi.distributed.cache.client.Serializer;
import
org.apache.nifi.distributed.cache.client.exception.DeserializationException;
-import org.apache.nifi.processor.Processor;
import org.apache.nifi.security.cert.builder.StandardCertificateBuilder;
import org.apache.nifi.security.ssl.EphemeralKeyStoreBuilder;
import org.apache.nifi.security.ssl.StandardSslContextBuilder;
import org.apache.nifi.ssl.SSLContextProvider;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
@@ -62,7 +62,7 @@ public class MapCacheServiceTlsTest {
@BeforeAll
public static void setServices() throws Exception {
- runner = TestRunners.newTestRunner(Mockito.mock(Processor.class));
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
sslContextProvider = createSslContextService();
runner.addControllerService(sslContextProvider.getIdentifier(),
sslContextProvider);
runner.enableControllerService(sslContextProvider);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheTest.java
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheTest.java
index 591e5707bc..9382042c98 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheTest.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/MapCacheTest.java
@@ -22,14 +22,13 @@ import
org.apache.nifi.distributed.cache.client.Deserializer;
import org.apache.nifi.distributed.cache.client.MapCacheClientService;
import org.apache.nifi.distributed.cache.client.Serializer;
import
org.apache.nifi.distributed.cache.client.exception.DeserializationException;
-import org.apache.nifi.processor.Processor;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import org.mockito.Mockito;
import java.io.IOException;
import java.io.OutputStream;
@@ -55,7 +54,7 @@ public class MapCacheTest {
@BeforeAll
public static void startServices() throws Exception {
- runner = TestRunners.newTestRunner(Mockito.mock(Processor.class));
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
server = new MapCacheServer();
runner.addControllerService(server.getClass().getName(), server);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/TestDistributedMapServerAndClient.java
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/TestDistributedMapServerAndClient.java
index 61e440072c..8101c4bc18 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/TestDistributedMapServerAndClient.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/map/TestDistributedMapServerAndClient.java
@@ -38,12 +38,12 @@ import
org.apache.nifi.event.transport.netty.ByteArrayMessageNettyEventServerFac
import org.apache.nifi.event.transport.netty.NettyEventServerFactory;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.DataUnit;
-import org.apache.nifi.processor.Processor;
import org.apache.nifi.remote.StandardVersionNegotiator;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.MockConfigurationContext;
import org.apache.nifi.util.MockControllerServiceInitializationContext;
import org.apache.nifi.util.MockPropertyValue;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterEach;
@@ -84,7 +84,7 @@ public class TestDistributedMapServerAndClient {
FileUtils.cleanDirectory(dataFile);
}
- runner = TestRunners.newTestRunner(Mockito.mock(Processor.class));
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
server = new MapCacheServer();
runner.addControllerService("server", server);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/SetCacheServiceTest.java
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/SetCacheServiceTest.java
index 03eb6e0206..74ec3713f8 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/SetCacheServiceTest.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/SetCacheServiceTest.java
@@ -20,13 +20,12 @@ import org.apache.commons.lang3.SerializationException;
import org.apache.nifi.distributed.cache.client.Serializer;
import org.apache.nifi.distributed.cache.client.SetCacheClientService;
import org.apache.nifi.distributed.cache.server.SetCacheServer;
-import org.apache.nifi.processor.Processor;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import java.io.IOException;
import java.io.OutputStream;
@@ -44,7 +43,7 @@ public class SetCacheServiceTest {
@BeforeAll
public static void setRunner() throws Exception {
- runner = TestRunners.newTestRunner(Mockito.mock(Processor.class));
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
server = new SetCacheServer();
runner.addControllerService(server.getClass().getName(), server);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/TestDistributedSetServerAndClient.java
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/TestDistributedSetServerAndClient.java
index 6f13887224..033a0b8e75 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/TestDistributedSetServerAndClient.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-distributed-cache-services-bundle/nifi-distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/set/TestDistributedSetServerAndClient.java
@@ -25,17 +25,16 @@ import
org.apache.nifi.distributed.cache.client.SetCacheClientService;
import org.apache.nifi.distributed.cache.server.AbstractCacheServer;
import org.apache.nifi.distributed.cache.server.SetCacheServer;
import org.apache.nifi.processor.DataUnit;
-import org.apache.nifi.processor.Processor;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.MockConfigurationContext;
import org.apache.nifi.util.MockControllerServiceInitializationContext;
import org.apache.nifi.util.MockPropertyValue;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import java.io.File;
import java.io.IOException;
@@ -63,7 +62,7 @@ public class TestDistributedSetServerAndClient {
FileUtils.cleanDirectory(dataFile);
}
- runner = TestRunners.newTestRunner(Mockito.mock(Processor.class));
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
server = new SetCacheServer();
runner.addControllerService("server", server);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestCSVRecordLookupService.java
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestCSVRecordLookupService.java
index cfde838ad9..16210101d3 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestCSVRecordLookupService.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestCSVRecordLookupService.java
@@ -20,6 +20,7 @@ import org.apache.nifi.csv.CSVUtils;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.serialization.record.Record;
import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -40,7 +41,7 @@ public class TestCSVRecordLookupService {
@BeforeEach
void setUp() throws InitializationException {
- runner = TestRunners.newTestRunner(TestProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
service = new CSVRecordLookupService();
runner.addControllerService("csv-record-lookup-service", service);
}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestProcessor.java
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestProcessor.java
deleted file mode 100644
index 382fc5b52d..0000000000
---
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestProcessor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.lookup;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestProcessor extends AbstractProcessor {
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- List<PropertyDescriptor> properties = new ArrayList<>();
- properties.add(new PropertyDescriptor.Builder()
- .name("LookupService test processor")
- .description("LookupService test processor")
- .identifiesControllerService(LookupService.class)
- .required(true)
- .build());
- return properties;
- }
-
-}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestPropertiesFileLookupService.java
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestPropertiesFileLookupService.java
index 0673140a6e..ce1ae7f7c6 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestPropertiesFileLookupService.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestPropertiesFileLookupService.java
@@ -19,6 +19,7 @@ package org.apache.nifi.lookup;
import org.apache.nifi.lookup.configuration2.CommonsConfigurationLookupService;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -33,7 +34,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestPropertiesFileLookupService {
- static final Optional<String> EMPTY_STRING = Optional.empty();
private PropertiesFileLookupService service;
@BeforeEach
@@ -43,7 +43,7 @@ public class TestPropertiesFileLookupService {
@Test
public void testPropertiesFileLookupService() throws
InitializationException, LookupFailureException {
- final TestRunner runner =
TestRunners.newTestRunner(TestProcessor.class);
+ final TestRunner runner =
TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("properties-file-lookup-service", service);
runner.setProperty(service,
PropertiesFileLookupService.CONFIGURATION_FILE,
"src/test/resources/test.properties");
@@ -62,12 +62,12 @@ public class TestPropertiesFileLookupService {
assertEquals(Optional.of("this is property 2"), property2);
final Optional<String> property3 =
lookupService.lookup(Collections.singletonMap("key", "property.3"));
- assertEquals(EMPTY_STRING, property3);
+ assertEquals(Optional.empty(), property3);
}
@Test
public void testPropertiesFileLookupServiceVariable() throws
InitializationException, LookupFailureException {
- final TestRunner runner =
TestRunners.newTestRunner(TestProcessor.class);
+ final TestRunner runner =
TestRunners.newTestRunner(NoOpProcessor.class);
runner.setEnvironmentVariableValue("myFile",
"src/test/resources/test.properties");
@@ -88,7 +88,7 @@ public class TestPropertiesFileLookupService {
assertEquals(Optional.of("this is property 2"), property2);
final Optional<String> property3 =
lookupService.lookup(Collections.singletonMap("key", "property.3"));
- assertEquals(EMPTY_STRING, property3);
+ assertEquals(Optional.empty(), property3);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleCsvFileLookupService.java
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleCsvFileLookupService.java
index 4904ed9cc5..11305fd49f 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleCsvFileLookupService.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleCsvFileLookupService.java
@@ -19,6 +19,7 @@ package org.apache.nifi.lookup;
import org.apache.nifi.csv.CSVUtils;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -35,13 +36,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestSimpleCsvFileLookupService {
- static final Optional<String> EMPTY_STRING = Optional.empty();
private TestRunner runner;
private SimpleCsvFileLookupService service;
@BeforeEach
void setUp() throws InitializationException {
- runner = TestRunners.newTestRunner(TestProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
service = new SimpleCsvFileLookupService();
runner.addControllerService("csv-file-lookup-service", service);
}
@@ -67,7 +67,7 @@ public class TestSimpleCsvFileLookupService {
assertEquals(Optional.of("this is property 2"), property2);
final Optional<String> property3 =
lookupService.lookup(Collections.singletonMap("key", "property.3"));
- assertEquals(EMPTY_STRING, property3);
+ assertEquals(Optional.empty(), property3);
}
@Test
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleKeyValueLookupService.java
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleKeyValueLookupService.java
index 17a45423e7..6950bb4adf 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleKeyValueLookupService.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestSimpleKeyValueLookupService.java
@@ -17,6 +17,7 @@
package org.apache.nifi.lookup;
import org.apache.nifi.reporting.InitializationException;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@ public class TestSimpleKeyValueLookupService {
public void testSimpleKeyValueLookupService() throws
InitializationException {
final SimpleKeyValueLookupService service = new
SimpleKeyValueLookupService();
- final TestRunner runner =
TestRunners.newTestRunner(TestProcessor.class);
+ final TestRunner runner =
TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("simple-key-value-lookup-service",
service);
runner.setProperty(service, "key1", "value1");
runner.setProperty(service, "key2", "value2");
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestXMLFileLookupService.java
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestXMLFileLookupService.java
index a116887617..512f32b656 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestXMLFileLookupService.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/TestXMLFileLookupService.java
@@ -19,6 +19,7 @@ package org.apache.nifi.lookup;
import org.apache.nifi.lookup.configuration2.CommonsConfigurationLookupService;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -34,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestXMLFileLookupService {
- static final Optional<String> EMPTY_STRING = Optional.empty();
private XMLFileLookupService service;
@BeforeEach
@@ -44,7 +44,7 @@ public class TestXMLFileLookupService {
@Test
public void testXMLFileLookupService() throws InitializationException,
LookupFailureException {
- final TestRunner runner =
TestRunners.newTestRunner(TestProcessor.class);
+ final TestRunner runner =
TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("xml-file-lookup-service", service);
runner.setProperty(service, XMLFileLookupService.CONFIGURATION_FILE,
"src/test/resources/test.xml");
@@ -66,14 +66,14 @@ public class TestXMLFileLookupService {
assertEquals(Optional.of("this is property 3"), property3);
final Optional<String> property4 =
lookupService.lookup(Collections.singletonMap("key", "properties.property(3)"));
- assertEquals(EMPTY_STRING, property4);
+ assertEquals(Optional.empty(), property4);
}
@Test
public void testXXEProtection() throws InitializationException {
// Arrange
- final TestRunner runner =
TestRunners.newTestRunner(TestProcessor.class);
+ final TestRunner runner =
TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("xml-file-lookup-service", service);
runner.setProperty(service, XMLFileLookupService.CONFIGURATION_FILE,
"src/test/resources/test-xxe.xml");
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/maxmind/TestIPLookupService.java
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/maxmind/TestIPLookupService.java
index d3103c3edb..4a24371792 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/maxmind/TestIPLookupService.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/maxmind/TestIPLookupService.java
@@ -18,9 +18,9 @@
package org.apache.nifi.lookup.maxmind;
import com.maxmind.geoip2.DatabaseReader;
-import org.apache.nifi.lookup.TestProcessor;
import org.apache.nifi.serialization.record.Record;
import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -66,7 +66,7 @@ public class TestIPLookupService {
@BeforeEach
public void setUp() {
- runner = TestRunners.newTestRunner(TestProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
testSubject = new IPLookupService() {
@NotNull
@Override
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestReaderLookup.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestReaderLookup.java
index 01f6cef7bd..fe8eda0930 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestReaderLookup.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestReaderLookup.java
@@ -24,9 +24,9 @@ import org.apache.nifi.schema.access.SchemaNotFoundException;
import org.apache.nifi.serialization.MalformedRecordException;
import org.apache.nifi.serialization.RecordReader;
import org.apache.nifi.serialization.RecordReaderFactory;
-import org.apache.nifi.serialization.TestRecordReaderProcessor;
import org.apache.nifi.serialization.record.Record;
import org.apache.nifi.serialization.record.RecordSchema;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -56,7 +56,7 @@ public class TestReaderLookup {
recordReaderB = new MockRecordReaderFactory("B");
readerLookup = new ReaderLookup();
- runner = TestRunners.newTestRunner(TestRecordReaderProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
final String rrServiceAIdentifier = "rr-A";
runner.addControllerService(rrServiceAIdentifier, recordReaderA);
@@ -105,7 +105,7 @@ public class TestReaderLookup {
@Test
public void testCustomValidateAtLeaseOneServiceDefined() throws
InitializationException {
// enable lookup service with no services registered, verify not valid
- runner = TestRunners.newTestRunner(TestRecordReaderProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("rr-lookup", readerLookup);
runner.assertNotValid(readerLookup);
@@ -120,7 +120,7 @@ public class TestReaderLookup {
@Test
public void testCustomValidateSelfReferenceNotAllowed() throws
InitializationException {
- runner = TestRunners.newTestRunner(TestRecordReaderProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("rr-lookup", readerLookup);
runner.setProperty(readerLookup, "lookup", "lookup");
runner.assertNotValid(readerLookup);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestRecordSetWriterLookup.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestRecordSetWriterLookup.java
index 05559e8561..a48b9a189f 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestRecordSetWriterLookup.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/lookup/TestRecordSetWriterLookup.java
@@ -24,12 +24,12 @@ import
org.apache.nifi.schema.access.SchemaNotFoundException;
import org.apache.nifi.serialization.RecordSetWriter;
import org.apache.nifi.serialization.RecordSetWriterFactory;
import org.apache.nifi.serialization.SimpleRecordSchema;
-import org.apache.nifi.serialization.TestRecordSetWriterProcessor;
import org.apache.nifi.serialization.WriteResult;
import org.apache.nifi.serialization.record.Record;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.serialization.record.SchemaIdentifier;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -43,6 +43,7 @@ import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestRecordSetWriterLookup {
private final String DEFAULT_ATTRIBUTE_NAME = "recordsetwriter.name";
@@ -59,7 +60,7 @@ public class TestRecordSetWriterLookup {
recordSetWriterB = new MockRecordSetWriterFactory("B");
recordSetWriterLookup = new RecordSetWriterLookup();
- runner = TestRunners.newTestRunner(TestRecordSetWriterProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
final String rrServiceAIdentifier = "rr-A";
runner.addControllerService(rrServiceAIdentifier, recordSetWriterA);
@@ -83,6 +84,7 @@ public class TestRecordSetWriterLookup {
RecordSchema recordSchema =
recordSetWriterLookup.getSchema(attributes, null);
assertNotNull(recordSchema);
+ assertTrue(recordSchema.getIdentifier().getName().isPresent());
assertEquals(recordSetWriterA.name,
recordSchema.getIdentifier().getName().get());
MockRecordSetWriter writer = (MockRecordSetWriter)
recordSetWriterLookup.createWriter(null, null, null, attributes);
@@ -129,7 +131,7 @@ public class TestRecordSetWriterLookup {
@Test
public void testCustomValidateAtLeaseOneServiceDefined() throws
InitializationException {
// enable lookup service with no services registered, verify not valid
- runner = TestRunners.newTestRunner(TestRecordSetWriterProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("rr-lookup", recordSetWriterLookup);
runner.assertNotValid(recordSetWriterLookup);
@@ -144,7 +146,7 @@ public class TestRecordSetWriterLookup {
@Test
public void testCustomValidateSelfReferenceNotAllowed() throws
InitializationException {
- runner = TestRunners.newTestRunner(TestRecordSetWriterProcessor.class);
+ runner = TestRunners.newTestRunner(NoOpProcessor.class);
runner.addControllerService("rr-lookup", recordSetWriterLookup);
runner.setProperty(recordSetWriterLookup, "lookup", "lookup");
runner.assertNotValid(recordSetWriterLookup);
@@ -155,7 +157,7 @@ public class TestRecordSetWriterLookup {
*/
private static class MockRecordSetWriterFactory extends
AbstractControllerService implements RecordSetWriterFactory {
- private String name;
+ private final String name;
public MockRecordSetWriterFactory(String name) {
this.name = name;
@@ -163,12 +165,12 @@ public class TestRecordSetWriterLookup {
@Override
- public RecordSchema getSchema(Map<String, String> variables,
RecordSchema readSchema) throws SchemaNotFoundException, IOException {
+ public RecordSchema getSchema(Map<String, String> variables,
RecordSchema readSchema) {
return new
SimpleRecordSchema(SchemaIdentifier.builder().name(name).build());
}
@Override
- public RecordSetWriter createWriter(ComponentLog logger, RecordSchema
schema, OutputStream out, Map<String, String> variables) throws
SchemaNotFoundException, IOException {
+ public RecordSetWriter createWriter(ComponentLog logger, RecordSchema
schema, OutputStream out, Map<String, String> variables) {
return new MockRecordSetWriter(name);
}
}
@@ -182,22 +184,22 @@ public class TestRecordSetWriterLookup {
@Override
- public WriteResult write(RecordSet recordSet) throws IOException {
+ public WriteResult write(RecordSet recordSet) {
return null;
}
@Override
- public void beginRecordSet() throws IOException {
+ public void beginRecordSet() {
}
@Override
- public WriteResult finishRecordSet() throws IOException {
+ public WriteResult finishRecordSet() {
return null;
}
@Override
- public WriteResult write(Record record) throws IOException {
+ public WriteResult write(Record record) {
return null;
}
@@ -207,12 +209,12 @@ public class TestRecordSetWriterLookup {
}
@Override
- public void flush() throws IOException {
+ public void flush() {
}
@Override
- public void close() throws IOException {
+ public void close() {
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/serialization/TestRecordReaderProcessor.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/serialization/TestRecordReaderProcessor.java
deleted file mode 100644
index 44c2f01d95..0000000000
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/serialization/TestRecordReaderProcessor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.serialization;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestRecordReaderProcessor extends AbstractProcessor {
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- List<PropertyDescriptor> propDescs = new ArrayList<>();
- propDescs.add(new PropertyDescriptor.Builder()
- .name("Record Reader")
- .description("Specifies the Controller Service to use for
reading incoming data")
- .identifiesControllerService(RecordReaderFactory.class)
- .required(true)
- .build());
- return propDescs;
- }
-}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/serialization/TestRecordSetWriterProcessor.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/serialization/TestRecordSetWriterProcessor.java
deleted file mode 100644
index 0a2b69ecf4..0000000000
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/serialization/TestRecordSetWriterProcessor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.serialization;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestRecordSetWriterProcessor extends AbstractProcessor {
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- List<PropertyDescriptor> propDescs = new ArrayList<>();
- propDescs.add(new PropertyDescriptor.Builder()
- .name("Record Writer")
- .description("Specifies the Controller Service to use for
writing out the records")
- .identifiesControllerService(RecordSetWriterFactory.class)
- .required(true)
- .build());
- return propDescs;
- }
-}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestEmailRecordSink.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestEmailRecordSink.java
index b7bd38397d..ded0da9390 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestEmailRecordSink.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestEmailRecordSink.java
@@ -29,6 +29,7 @@ import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -87,7 +88,7 @@ public class TestEmailRecordSink {
@BeforeEach
public void setup() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(TestProcessor.class);
+ TestRunner runner = TestRunners.newTestRunner(NoOpProcessor.class);
runner.setValidateExpressionUsage(false);
recordSink = new EmailRecordSinkExtension();
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestLoggingRecordSink.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestLoggingRecordSink.java
index 1623b99974..e391745bb7 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestLoggingRecordSink.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestLoggingRecordSink.java
@@ -27,6 +27,7 @@ import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockPropertyConfiguration;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.PropertyMigrationResult;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -50,7 +51,7 @@ public class TestLoggingRecordSink {
@BeforeEach
public void setup() throws InitializationException {
- TestRunner runner = TestRunners.newTestRunner(TestProcessor.class);
+ TestRunner runner = TestRunners.newTestRunner(NoOpProcessor.class);
recordSink = new LoggingRecordSink();
runner.addControllerService("log", recordSink);
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestProcessor.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestProcessor.java
deleted file mode 100644
index b0a6c5a83b..0000000000
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/TestProcessor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.record.sink;
-
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.processor.AbstractProcessor;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.ProcessSession;
-import org.apache.nifi.processor.exception.ProcessException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestProcessor extends AbstractProcessor {
-
- @Override
- public void onTrigger(ProcessContext context, ProcessSession session)
throws ProcessException {
- }
-
- @Override
- protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
- List<PropertyDescriptor> propDescs = new ArrayList<>();
- propDescs.add(new PropertyDescriptor.Builder()
- .name("RecordSinkService test processor")
- .description("RecordSinkService test processor")
- .identifiesControllerService(RecordSinkService.class)
- .required(true)
- .build());
- return propDescs;
- }
-}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/lookup/TestRecordSinkServiceLookup.java
b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/lookup/TestRecordSinkServiceLookup.java
index 6a4ffbf103..dc852a2f8a 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/lookup/TestRecordSinkServiceLookup.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/src/test/java/org/apache/nifi/record/sink/lookup/TestRecordSinkServiceLookup.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.record.sink.lookup;
-import org.apache.nifi.record.sink.TestProcessor;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.serialization.SimpleRecordSchema;
import org.apache.nifi.serialization.WriteResult;
@@ -26,6 +25,7 @@ import org.apache.nifi.serialization.record.RecordField;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +46,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class TestRecordSinkServiceLookup {
private MockRecordSinkServiceLookup sinkLookup;
- private TestRunner runner;
private MockRecordSinkService sinkA;
private MockRecordSinkService sinkB;
private RecordSet recordSet;
@@ -57,7 +56,7 @@ public class TestRecordSinkServiceLookup {
sinkB = new MockRecordSinkService("b");
sinkLookup = new MockRecordSinkServiceLookup();
- runner = TestRunners.newTestRunner(TestProcessor.class);
+ TestRunner runner = TestRunners.newTestRunner(NoOpProcessor.class);
final String sinkServiceAIdentifier = "a";
runner.addControllerService(sinkServiceAIdentifier, sinkA);
diff --git
a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/test/java/org/apache/nifi/websocket/jetty/TestJettyWebSocketClient.java
b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/test/java/org/apache/nifi/websocket/jetty/TestJettyWebSocketClient.java
index 67fd4b3aaf..9a346e0465 100644
---
a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/test/java/org/apache/nifi/websocket/jetty/TestJettyWebSocketClient.java
+++
b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/test/java/org/apache/nifi/websocket/jetty/TestJettyWebSocketClient.java
@@ -17,11 +17,10 @@
package org.apache.nifi.websocket.jetty;
import org.apache.nifi.components.ValidationResult;
-import org.apache.nifi.processor.Processor;
+import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
import java.util.Collection;
@@ -105,7 +104,7 @@ public class TestJettyWebSocketClient {
@Test
public void testCustomAuthHeader() throws Exception {
- final TestRunner runner =
TestRunners.newTestRunner(Mockito.mock(Processor.class));
+ final TestRunner runner =
TestRunners.newTestRunner(NoOpProcessor.class);
final TestableJettyWebSocketClient testSubject = new
TestableJettyWebSocketClient();
runner.addControllerService("client", testSubject);
runner.setProperty(testSubject, JettyWebSocketClient.WS_URI,
"wss://localhost:9001/test");
