[nifi] branch support/nifi-1.x updated: NIFI-8128 Corrected merge conflicts for Redis integration tests

[exceptionfactory]

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

exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new fb707b5c59 NIFI-8128 Corrected merge conflicts for Redis integration 
tests
fb707b5c59 is described below

commit fb707b5c598d5788645b08cce5757b6f593246c1
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Sat Jul 15 20:05:41 2023 -0500

    NIFI-8128 Corrected merge conflicts for Redis integration tests
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../nifi/redis/service/ITRedisDistributedMapCacheClientService.java   | 1 -
 .../test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/service/ITRedisDistributedMapCacheClientService.java
 
b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/service/ITRedisDistributedMapCacheClientService.java
index 3a9a272a21..18f60dae16 100644
--- 
a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/service/ITRedisDistributedMapCacheClientService.java
+++ 
b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/service/ITRedisDistributedMapCacheClientService.java
@@ -62,7 +62,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 
-import static org.apache.nifi.redis.util.RedisUtils.REDIS_CONNECTION_POOL;
 import static org.apache.nifi.redis.util.RedisUtils.REDIS_MODE_SENTINEL;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git 
a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
 
b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
index 048ae25583..8b28cd4df6 100644
--- 
a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
+++ 
b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/src/test/java/org/apache/nifi/redis/state/ITRedisStateProvider.java
@@ -61,14 +61,14 @@ public class ITRedisStateProvider {
     private RedisStateProvider provider;
 
     @BeforeEach
-    public void setup() {
+    public void setup() throws Exception {
         final Map<PropertyDescriptor, String> properties = new HashMap<>();
         properties.put(RedisUtils.CONNECTION_STRING, redisContainer.getHost() 
+ ":" + redisContainer.getFirstMappedPort());
         this.provider = createProvider(properties);
     }
 
     @AfterEach
-    public void teardown() throws IOException {
+    public void teardown() {
         if (provider != null) {
             try {
                 provider.clear(componentId);