You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2022/11/08 20:51:32 UTC

[nifi] branch main updated (747b5d4d9e -> 889254a9dc)

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

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


    from 747b5d4d9e NIFI-10317 Taking care of NullPointerException if AMQP header value is null NIFI-10317 refactoring to remove repeated conversions to string from char NIFI-10317 correctly handle null values: null vs "null" NIFI-10317 adding test NIFI-10317 - Updated ConsumeAMQPTest to test for null and empty header values. NIFI-10317 - Updated ConsumeAMQPTest to use hard coded string values when testing. Made convertMapToString() private.
     new ce18b63db0 NIFI-10743 Used LinkedHashMap in TestHBase_1_1_2_ClientService.testScan
     new 889254a9dc NIFI-10744 Used LinkedHashMap in TestScanHBase methods

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/test/java/org/apache/nifi/hbase/MockHBaseClientService.java  | 3 ++-
 .../src/test/java/org/apache/nifi/hbase/TestScanHBase.java           | 5 +++--
 .../java/org/apache/nifi/hbase/TestHBase_1_1_2_ClientService.java    | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)


[nifi] 02/02: NIFI-10744 Used LinkedHashMap in TestScanHBase methods

Posted by ex...@apache.org.
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

commit 889254a9dce63e189388c9921c0edcf605a2dadd
Author: sopan98 <ph...@gmail.com>
AuthorDate: Tue Nov 1 20:12:11 2022 -0500

    NIFI-10744 Used LinkedHashMap in TestScanHBase methods
    
    This closes #6633
    
    Signed-off-by: David Handermann <ex...@apache.org>
---
 .../src/test/java/org/apache/nifi/hbase/MockHBaseClientService.java  | 3 ++-
 .../src/test/java/org/apache/nifi/hbase/TestScanHBase.java           | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/MockHBaseClientService.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/MockHBaseClientService.java
index 99dfa0040c..b913edf440 100644
--- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/MockHBaseClientService.java
+++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/MockHBaseClientService.java
@@ -29,12 +29,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 public class MockHBaseClientService extends AbstractControllerService implements HBaseClientService {
 
-    private Map<String,ResultCell[]> results = new HashMap<>();
+    private Map<String,ResultCell[]> results = new LinkedHashMap<>();
     private Map<String, List<PutFlowFile>> flowFilePuts = new HashMap<>();
     private boolean throwException = false;
     private boolean throwExceptionDuringBatchDelete = false;
diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestScanHBase.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestScanHBase.java
index 46a5c24905..b0800ddf09 100644
--- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestScanHBase.java
+++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestScanHBase.java
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -127,7 +128,7 @@ public class TestScanHBase {
 
     @Test
     public void testScanToContentWithStringValues() {
-        final Map<String, String> cells = new HashMap<>();
+        final Map<String, String> cells = new LinkedHashMap<>();
         cells.put("cq1", "val1");
         cells.put("cq2", "val2");
 
@@ -292,7 +293,7 @@ public class TestScanHBase {
 
     @Test
     public void testScanToContentWithQualifierAndValueJSON() {
-        final Map<String, String> cells = new HashMap<>();
+        final Map<String, String> cells = new LinkedHashMap<>();
         cells.put("cq1", "val1");
         cells.put("cq2", "val2");
 


[nifi] 01/02: NIFI-10743 Used LinkedHashMap in TestHBase_1_1_2_ClientService.testScan

Posted by ex...@apache.org.
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

commit ce18b63db0b86035d523e46e744c1fae512f3452
Author: sopan98 <ph...@gmail.com>
AuthorDate: Tue Nov 1 17:47:27 2022 -0500

    NIFI-10743 Used LinkedHashMap in TestHBase_1_1_2_ClientService.testScan
    
    This closes #6632
    
    Signed-off-by: David Handermann <ex...@apache.org>
---
 .../test/java/org/apache/nifi/hbase/TestHBase_1_1_2_ClientService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/test/java/org/apache/nifi/hbase/TestHBase_1_1_2_ClientService.java b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/test/java/org/apache/nifi/hbase/TestHBase_1_1_2_ClientService.java
index 3525182d6a..a25eefdede 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/test/java/org/apache/nifi/hbase/TestHBase_1_1_2_ClientService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/src/test/java/org/apache/nifi/hbase/TestHBase_1_1_2_ClientService.java
@@ -43,7 +43,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -407,7 +406,7 @@ public class TestHBase_1_1_2_ClientService {
         // stage some results in the mock service...
         final long now = System.currentTimeMillis();
 
-        final Map<String, String> cells = new HashMap<>();
+        final Map<String, String> cells = new LinkedHashMap<>();
         cells.put("greeting", "hello");
         cells.put("name", "nifi");