Merge remote-tracking branch 'redis/master' into sentinel-tls-3

 Conflicts:
	src/main/java/redis/clients/jedis/JedisSentinelPool.java
	src/test/java/redis/clients/jedis/tests/SSLJedisSentinelPoolTest.java

Author: sazzad16

.github/release-drafter-config.yml

@@ -1,7 +1,7 @@
-name-template: 'Version $NEXT_PATCH_VERSION🌈'
-tag-template: 'v$NEXT_PATCH_VERSION'
+name-template: '$NEXT_PATCH_VERSION'
+tag-template: 'jedis-$NEXT_PATCH_VERSION'
 categories:
-  - title: '🚀Features'
+  - title: 'Features'
     labels:
       - 'feature'
       - 'enhancement'
@@ -10,7 +10,7 @@ categories:
       - 'fix'
       - 'bugfix'
       - 'bug'
-  - title: '🧰Maintenance'
+  - title: 'Maintenance'
     label: 'chore'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
 exclude-labels:

.github/workflows/release-drafter.yml

@@ -0,0 +1,20 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        with:
+          # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+           config-name: release-drafter-config.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

README.md

@@ -58,7 +58,7 @@ Or use it as a maven dependency:
 <dependency>
     <groupId>redis.clients</groupId>
     <artifactId>jedis</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
     <type>jar</type>
     <scope>compile</scope>
 </dependency>

pom.xml

@@ -50,6 +50,7 @@
 		<cluster-hosts>localhost:7379,localhost:7380,localhost:7381,localhost:7382,localhost:7383,localhost:7384,localhost:7385</cluster-hosts>
 		<github.global.server>github</github.global.server>
 		<log4j.version>2.13.3</log4j.version>
+		<jedis.module.name>redis.clients.jedis</jedis.module.name>
 	</properties>
 
 	<dependencies>
@@ -200,11 +201,14 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.0.2</version>
 				<configuration>
-					<archive>  
+					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-					</archive> 
+						<manifestEntries>
+							<Automatic-Module-Name>${jedis.module.name}</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
 				</configuration>
-			</plugin> 
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -213,11 +217,11 @@
 					<execution>
 						<id>bundle-manifest</id>
 						<phase>process-classes</phase>
-						<goals>    
+						<goals>
 							<goal>manifest</goal>
-						</goals>   
+						</goals>
 					</execution>
-				</executions>		
+				</executions>
 			</plugin>
 		</plugins>
 	</build>

src/main/java/redis/clients/jedis/AccessControlLogEntry.java

@@ -4,107 +4,97 @@
 import java.util.*;
 
 /**
- * This class holds information about an Access Control Log entry (returned by ACL LOG command)
- * They can be access via getters.
- * For future purpose there is also {@link #getlogEntry} method
- * that returns a generic {@code Map} - in case where more info is returned from a server
- *
+ * This class holds information about an Access Control Log entry (returned by ACL LOG command) They
+ * can be access via getters. For future purpose there is also {@link #getlogEntry} method that
+ * returns a generic {@code Map} - in case where more info is returned from a server
  */
 public class AccessControlLogEntry implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    public static final String COUNT = "count";
-    public static final String REASON = "reason";
-    public static final String CONTEXT = "context";
-    public static final String OBJECT = "object";
-    public static final String USERNAME = "username";
-    public static final String AGE_SECONDS = "age-seconds";
-    public static final String CLIENT_INFO = "client-info";
-
-    private long count;
-    private final String reason;
-    private final String context;
-    private final String object;
-    private final String username;
-    private final String ageSeconds;
-    private final Map<String,String> clientInfo;
-    private final Map<String,Object> logEntry;
-
-
-    public AccessControlLogEntry(Map<String, Object> map) {
-        count = (long)map.get(COUNT);
-        reason = (String)map.get(REASON);
-        context = (String)map.get(CONTEXT);
-        object = (String)map.get(OBJECT);
-        username = (String)map.get(USERNAME);
-        ageSeconds = (String)map.get(AGE_SECONDS);
-        clientInfo = getMapFromRawClientInfo((String)map.get(CLIENT_INFO));
-        logEntry = map;
-    }
-
-    public long getCount() {
-        return count;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public String getContext() {
-        return context;
-    }
-
-    public String getObject() {
-        return object;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public String getAgeSeconds() {
-        return ageSeconds;
-    }
-
-    public Map<String, String> getClientInfo() {
-        return clientInfo;
-    }
-
-    /**
-     * @return Generic map containing all key-value pairs returned by the server
-     */
-    public Map<String,Object> getlogEntry() {
-        return logEntry;
-    }
-
-    /**
-     * Convert the client-info string into a Map of String.
-     * When the value is empty, the value in the map is set to an empty string
-     * The key order is maintained to reflect the string return by Redis
-     * @param clientInfo
-     * @return A Map with all client info
-     */
-    private Map<String,String> getMapFromRawClientInfo( String clientInfo) {
-        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]:"" );
-        }
-        return clientInfoMap;
-    }
-
-    @Override
-    public String toString() {
-        return "AccessControlLogEntry{" +
-                "count=" + count +
-                ", reason='" + reason + '\'' +
-                ", context='" + context + '\'' +
-                ", object='" + object + '\'' +
-                ", username='" + username + '\'' +
-                ", ageSeconds='" + ageSeconds + '\'' +
-                ", clientInfo=" + clientInfo +
-                '}';
+  private static final long serialVersionUID = 1L;
+
+  public static final String COUNT = "count";
+  public static final String REASON = "reason";
+  public static final String CONTEXT = "context";
+  public static final String OBJECT = "object";
+  public static final String USERNAME = "username";
+  public static final String AGE_SECONDS = "age-seconds";
+  public static final String CLIENT_INFO = "client-info";
+
+  private long count;
+  private final String reason;
+  private final String context;
+  private final String object;
+  private final String username;
+  private final String ageSeconds;
+  private final Map<String, String> clientInfo;
+  private final Map<String, Object> logEntry;
+
+  public AccessControlLogEntry(Map<String, Object> map) {
+    count = (long) map.get(COUNT);
+    reason = (String) map.get(REASON);
+    context = (String) map.get(CONTEXT);
+    object = (String) map.get(OBJECT);
+    username = (String) map.get(USERNAME);
+    ageSeconds = (String) map.get(AGE_SECONDS);
+    clientInfo = getMapFromRawClientInfo((String) map.get(CLIENT_INFO));
+    logEntry = map;
+  }
+
+  public long getCount() {
+    return count;
+  }
+
+  public String getReason() {
+    return reason;
+  }
+
+  public String getContext() {
+    return context;
+  }
+
+  public String getObject() {
+    return object;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public String getAgeSeconds() {
+    return ageSeconds;
+  }
+
+  public Map<String, String> getClientInfo() {
+    return clientInfo;
+  }
+
+  /**
+   * @return Generic map containing all key-value pairs returned by the server
+   */
+  public Map<String, Object> getlogEntry() {
+    return logEntry;
+  }
+
+  /**
+   * Convert the client-info string into a Map of String. When the value is empty, the value in the
+   * map is set to an empty string The key order is maintained to reflect the string return by Redis
+   * @param clientInfo
+   * @return A Map with all client info
+   */
+  private Map<String, String> getMapFromRawClientInfo(String clientInfo) {
+    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] : "");
     }
+    return clientInfoMap;
+  }
+
+  @Override
+  public String toString() {
+    return "AccessControlLogEntry{" + "count=" + count + ", reason='" + reason + '\''
+        + ", context='" + context + '\'' + ", object='" + object + '\'' + ", username='" + username
+        + '\'' + ", ageSeconds='" + ageSeconds + '\'' + ", clientInfo=" + clientInfo + '}';
+  }
 }