Skip to content

Commit

Permalink
Merge branch 'master' into feature-introduce-jedis-thread-factory
Browse files Browse the repository at this point in the history
  • Loading branch information
sazzad16 authored Aug 19, 2023
2 parents 44713b7 + 2c609cf commit 73e6265
Show file tree
Hide file tree
Showing 83 changed files with 1,322 additions and 527 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021-2023, Redis, inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
22 changes: 0 additions & 22 deletions LICENSE.txt

This file was deleted.

13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ The most recent version of this library supports redis version [5.0](https://git

The table below highlights version compatibility of the most-recent library versions and Redis versions. Compatibility means communication features, and Redis command capabilities.

| Library version | Supported redis versions |
|-----------------|-------------------|
| 3.9+ | 5.0 and 6.2 Family of releases |
| >= 4.0 | Version 5.0 to current |

| Library version | Supported redis versions | JDK Compatibility |
|-----------------|--------------------------------|-------------------|
| 3.9+ | 5.0 and 6.2 Family of releases | 8, 11 |
| >= 4.0 | Version 5.0 to current | 8, 11, 17 |

## Getting started

Expand All @@ -42,7 +43,7 @@ To get started with Jedis, first add it as a dependency in your Java project. If
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>4.3.0</version>
<version>4.4.3</version>
</dependency>
```

Expand Down Expand Up @@ -78,7 +79,7 @@ for the complete list of supported commands.

### Easier way of using connection pool

Using a *try-with-resources* block for each command may be cumbursome, so you may consider using JedisPooled.
Using a *try-with-resources* block for each command may be cumbersome, so you may consider using JedisPooled.

```java
JedisPooled jedis = new JedisPooled("localhost", 6379);
Expand Down
2 changes: 1 addition & 1 deletion docs/failover.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ FailoverReporter reporter = new FailoverReporter();
provider.setClusterFailoverPostProcessor(reporter);
```

The provider will call your `accept` whenver a faoliver occurs.
The provider will call your `accept` whenever a faoliver occurs.

## Failing back

Expand Down
17 changes: 17 additions & 0 deletions docs/jedis5-breaking.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,16 @@
- `tsMRevRange(long fromTimestamp, long toTimestamp, String... filters)`
- `tsMRevRange(TSMRangeParams multiRangeParams)`

- `jsonNumIncrBy(String key, Path2 path, double value)` method now returns `Object` instead of `JSONArray`.
- Previously when it was returning JSONArray, returned would still be JSONArray. So simple type casting should be enough to handle this change.
- The returning object will be `List<Double>` when running under RESP3 protocol.

- `getAgeSeconds()` in `AccessControlLogEntry` now returns `Double` instead of `String`.

- Both `ftConfigGet(String option)` and `ftConfigGet(String indexName, String option)` methods now return `Map<String, Object>` instead of `Map<String, String>`.

- `ftList()` method now returns `Set<String>` instead of `List<String>`.

- `graphSlowlog(String graphName)` now returns `List<List<Object>>` (instead of `List<List<String>>`).

- All _payload_ related parameters are removed from _search_ related classes; namely `Document`, `IndexDefinition`, `Query`.
Expand All @@ -59,6 +67,11 @@
- `BINARY_MAP_FROM_PAIRS`
- `STRING_ORDERED_SET`

- Following methods supporting JSON.RESP command have been removed:
- `jsonResp(String key)`
- `jsonResp(String key, Path path)`
- `jsonResp(String key, Path2 path)`

- `RedisJsonCommands` and `RedisJsonPipelineCommands` interfaces have been moved into `redis.clients.jedis.json.commands` package.

- `Queable` class is removed.
Expand All @@ -74,6 +87,10 @@

- `getParams()` method is removed from `SortingParams` class.

- Both `SEARCH_AGGREGATION_RESULT` and `SEARCH_AGGREGATION_RESULT_WITH_CURSOR` implementations from `SearchBuilderFactory` class have been moved to `AggregationResult` class.

- All `AggregationResult` constructors have been made `private`.

- `addCommandEncodedArguments` and `addCommandBinaryArguments` methods have been removed from `FieldName` class.

- `getArgs` method is removed from `AggregationBuilder` class.
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
<name>Jedis Mailing List</name>
<post>[email protected]</post>
<archive>
http://groups.google.com/group/jedis_redis
https://groups.google.com/group/jedis_redis
</archive>
</mailingList>
</mailingLists>

<licenses>
<license>
<name>MIT</name>
<url>http://github.com/redis/jedis/raw/master/LICENSE.txt</url>
<url>https://github.com/redis/jedis/blob/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>

<issueManagement>
<system>github</system>
<url>http://github.com/redis/jedis/issues</url>
<url>https://github.com/redis/jedis/issues</url>
</issueManagement>

<scm>
Expand Down Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20230227</version>
<version>20230618</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down
Loading

0 comments on commit 73e6265

Please sign in to comment.