nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbe...@apache.org
Subject [nifi] 02/02: NIFI-7929 Resolving conflicts after rebasing on top of NIFI-7719
Date Tue, 27 Oct 2020 14:18:34 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 3612973a47d7b9134a8852e0a26f3f92c8a99529
Author: Bryan Bende <bbende@apache.org>
AuthorDate: Tue Oct 27 10:17:24 2020 -0400

    NIFI-7929 Resolving conflicts after rebasing on top of NIFI-7719
    
    This clsoes #4610.
    
    Signed-off-by: Bryan Bende <bbende@apache.org>
---
 .../client/JerseyExtendedNiFiRegistryClient.java   |  0
 .../toolkit/cli/impl/client/TestClientTimeout.java | 24 +---------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/client/JerseyExtendedNiFiRegistryClient.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/client/JerseyExtendedNiFiRegistryClient.java
deleted file mode 100644
index e69de29..0000000
diff --git a/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/client/TestClientTimeout.java
b/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/client/TestClientTimeout.java
index fb60d62..60d5afb 100644
--- a/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/client/TestClientTimeout.java
+++ b/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/client/TestClientTimeout.java
@@ -25,7 +25,6 @@ import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClient;
 import org.apache.nifi.toolkit.cli.impl.client.nifi.impl.JerseyNiFiClient;
 import org.apache.nifi.toolkit.cli.impl.command.CommandProcessor;
 import org.apache.nifi.toolkit.cli.impl.command.nifi.AbstractNiFiCommand;
-import org.apache.nifi.toolkit.cli.impl.command.registry.AbstractNiFiRegistryCommand;
 import org.apache.nifi.toolkit.cli.impl.context.StandardContext;
 import org.apache.nifi.toolkit.cli.impl.session.InMemorySession;
 import org.glassfish.jersey.client.ClientProperties;
@@ -57,13 +56,7 @@ public class TestClientTimeout {
             return nifiClient;
         }).when(nifiClientFactory).createClient(Mockito.any(Properties.class));
 
-        nifiRegClientFactory = Mockito.spy(new NiFiRegistryClientFactory());
-        Mockito.doAnswer(invocationOnMock -> {
-            final JerseyExtendedNiFiRegistryClient nifiRegistryClient = Mockito.spy((JerseyExtendedNiFiRegistryClient)
invocationOnMock.callRealMethod());
-            Mockito.doNothing().when(nifiRegistryClient).close(); // avoid closing the client
before getting the configuration in the test method
-            client[0] = nifiRegistryClient.client;
-            return nifiRegistryClient;
-        }).when(nifiRegClientFactory).createClient(Mockito.any(Properties.class));
+        nifiRegClientFactory = Mockito.mock(NiFiRegistryClientFactory.class);
 
         context = new StandardContext.Builder()
                 .output(System.out)
@@ -100,21 +93,6 @@ public class TestClientTimeout {
         });
     }
 
-    @Test
-    public void testNiFiRegistryClientTimeoutSettings() {
-        testClientTimeoutSettings(new AbstractNiFiRegistryCommand<Result>("test", Result.class)
{
-            @Override
-            public Result doExecute(NiFiRegistryClient client, Properties properties) {
-                return null;
-            }
-
-            @Override
-            public String getDescription() {
-                return "";
-            }
-        });
-    }
-
     private void testClientTimeoutSettings(Command<?> command) {
         command.initialize(context);
         final CommandProcessor processor = new CommandProcessor(Collections.singletonMap("test",
command), Collections.emptyMap(), context);


Mime
View raw message