more binary method, and better loops after review of the for issue #2170

redis · Dec 6, 2020 · 7774f6d · 7774f6d
1 parent 2848ec2
commit 7774f6d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 18 deletions.
diff --git a/src/main/java/redis/clients/jedis/AccessControlLogEntry.java b/src/main/java/redis/clients/jedis/AccessControlLogEntry.java
@@ -86,9 +86,9 @@ public Map<String,Object> getlogEntry() {
      * @return A Map with all client info
      */
     private Map<String,String> getMapFromRawClientInfo( String clientInfo) {
-        Map<String,String> clientInfoMap =  new LinkedHashMap<>();
-        List<String> myList = new ArrayList<String>(Arrays.asList(clientInfo.split(" ")));
-        for (String entry : myList) {
+        String[] entries = clientInfo.split(" ");
+        Map<String,String> clientInfoMap =  new LinkedHashMap<>(entries.length);
+        for (String entry : entries) {
             String[] kvArray = entry.split("=");
             clientInfoMap.put(kvArray[0], (kvArray.length ==2)?kvArray[1]:"" );
         }

diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -3748,10 +3748,23 @@ public List<byte[]> aclCat(byte[] category) {
   }
 
   @Override
-  public String aclLog(byte[] options) {
+  public List<byte[]> aclLogBinary() {
+    checkIsInMultiOrPipeline();
+    client.aclLog();
+    return client.getBinaryMultiBulkReply();
+  }
+
+  @Override
+  public List<byte[]> aclLogBinary(int limit) {
+    checkIsInMultiOrPipeline();
+    client.aclLog(limit);
+    return client.getBinaryMultiBulkReply();
+  }
+  @Override
+  public byte[] aclLog(byte[] options) {
     checkIsInMultiOrPipeline();
     client.aclLog(options);
-    return client.getStatusCodeReply();
+    return client.getBinaryBulkReply();
   }
 
   @Override

diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java
@@ -528,7 +528,7 @@ public String toString() {
    */
   public static final Builder<List<AccessControlLogEntry>> ACCESS_CONTROL_LOG_ENTRY_LIST = new Builder<List<AccessControlLogEntry>>() {
 
-    Map<String,Builder> mappingFunctions = createDecoderMap();
+    private final Map<String,Builder> mappingFunctions = createDecoderMap();
 
     private Map<String, Builder> createDecoderMap() {
 
@@ -552,11 +552,8 @@ public List<AccessControlLogEntry> build(Object data) {
       }
 
       List<AccessControlLogEntry> list = new ArrayList<>();
-      List<Object> logEntries = (List<Object>)data;
-      Iterator<Object> logsArray = logEntries.iterator();
-
-      while (logsArray.hasNext()) {
-        List<Object> logEntryData = (List<Object>) logsArray.next();
+      List<List<Object>> logEntries = (List<List<Object>>)data;
+      for  (List<Object> logEntryData : logEntries) {
         Iterator<Object> logEntryDataIterator = logEntryData.iterator();
         AccessControlLogEntry accessControlLogEntry = new AccessControlLogEntry(
                 createMapFromDecodingFunctions(logEntryDataIterator,mappingFunctions));

diff --git a/src/main/java/redis/clients/jedis/commands/AdvancedBinaryJedisCommands.java b/src/main/java/redis/clients/jedis/commands/AdvancedBinaryJedisCommands.java
@@ -75,7 +75,11 @@ public interface AdvancedBinaryJedisCommands {
 
   List<byte[]> aclCat(byte[] category);
 
-  String aclLog(byte[] options);
+  List<byte[]> aclLogBinary();
+
+  List<byte[]> aclLogBinary(int limit);
+
+  byte[] aclLog(byte[] options);
 
   // TODO: Implements ACL LOAD/SAVE commands
 }
diff --git a/src/test/java/redis/clients/jedis/tests/commands/AccessControlListCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/AccessControlListCommandsTest.java
@@ -344,7 +344,6 @@ public void aclLogTest() {
     assertEquals("command", jedis.aclLog().get(0).getReason());
     assertEquals("get", jedis.aclLog().get(0).getObject());
 
-
     // Capture similar event
     jedis.aclLog("RESET");
     assertTrue(jedis.aclLog().isEmpty());
@@ -365,9 +364,6 @@ public void aclLogTest() {
     assertEquals(10, jedis.aclLog().get(0).getCount());
     assertEquals("get", jedis.aclLog().get(0).getObject());
 
-
-
-
     // Generate another type of error
     jedis.auth("antirez", "foo");
     try {
@@ -382,7 +378,6 @@ public void aclLogTest() {
     assertEquals("somekeynotallowed", jedis.aclLog().get(0).getObject());
     assertEquals("key", jedis.aclLog().get(0).getReason());
 
-
     jedis.aclLog("RESET");
     assertTrue(jedis.aclLog().isEmpty());
 
@@ -419,7 +414,10 @@ public void aclLogTest() {
     assertEquals("Number of log messages ", 2, jedis.aclLog(2).size());
 
      // Binary tests
-    jedis.aclLog("RESET".getBytes());
+    assertEquals("Number of log messages ", 3, jedis.aclLogBinary().size());
+    assertEquals("Number of log messages ", 2, jedis.aclLogBinary(2).size());
+    byte[] status = jedis.aclLog("RESET".getBytes());
+    assertNotNull(status);
     assertTrue(jedis.aclLog().isEmpty());
 
     jedis.aclDelUser("antirez");