github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:redisson/redisson

Browse Source
pull/5829/head
Nikita Koksharov 9 months ago
parent df1deb2a7c 99feb22af0
commit de245e9883
37 changed files with 74 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape Escape View File

@ -257,7 +257,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>

2
redisson-all/pom.xml
Unescape Escape View File

@ -105,7 +105,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<index>true</index> <index>true</index>

2
redisson-hibernate/redisson-hibernate-4/pom.xml
Unescape Escape View File

@ -64,7 +64,7 @@
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-hibernate/redisson-hibernate-5/pom.xml
Unescape Escape View File

@ -82,7 +82,7 @@
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-hibernate/redisson-hibernate-52/pom.xml
Unescape Escape View File

@ -75,7 +75,7 @@
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-hibernate/redisson-hibernate-53/pom.xml
Unescape Escape View File

@ -80,7 +80,7 @@
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-hibernate/redisson-hibernate-6/pom.xml
Unescape Escape View File

@ -60,7 +60,7 @@
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-micronaut/redisson-micronaut-20/pom.xml
Unescape Escape View File

@ -51,7 +51,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version> <version>3.13.0</version>
<configuration> <configuration>
<compilerArgs> <compilerArgs>
<arg>-parameters</arg> <arg>-parameters</arg>

2
redisson-micronaut/redisson-micronaut-30/pom.xml
Unescape Escape View File

@ -55,7 +55,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version> <version>3.13.0</version>
<configuration> <configuration>
<compilerArgs> <compilerArgs>
<arg>-parameters</arg> <arg>-parameters</arg>

2
redisson-quarkus/pom.xml
Unescape Escape View File

@ -20,7 +20,7 @@
</modules> </modules>
<properties> <properties>
<compiler-plugin.version>3.11.0</compiler-plugin.version> <compiler-plugin.version>3.13.0</compiler-plugin.version>
<surefire-plugin.version>3.0.0</surefire-plugin.version> <surefire-plugin.version>3.0.0</surefire-plugin.version>
<failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version> <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
</properties> </properties>

2
redisson-quarkus/redisson-quarkus-20/runtime/pom.xml
Unescape Escape View File

@ -60,7 +60,7 @@
<dependency> <dependency>
<groupId>com.github.ben-manes.caffeine</groupId> <groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId> <artifactId>caffeine</artifactId>
<version>3.1.1</version> <version>3.1.8</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
redisson-quarkus/redisson-quarkus-30/runtime/pom.xml
Unescape Escape View File

@ -65,7 +65,7 @@
<dependency> <dependency>
<groupId>com.github.ben-manes.caffeine</groupId> <groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId> <artifactId>caffeine</artifactId>
<version>3.1.1</version> <version>3.1.8</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
redisson-spring-boot-starter/pom.xml
Unescape Escape View File

@ -21,7 +21,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/pom.xml
Unescape Escape View File

@ -103,7 +103,7 @@
<dependency> <dependency>
<groupId>io.projectreactor</groupId> <groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId> <artifactId>reactor-test</artifactId>
<version>3.6.4</version> <version>3.6.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
redisson-spring-data/redisson-spring-data-16/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-17/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-18/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-20/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-21/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-22/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-23/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-24/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-25/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-26/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-27/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-30/pom.xml
Unescape Escape View File

@ -25,7 +25,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-31/pom.xml
Unescape Escape View File

@ -32,7 +32,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-spring-data/redisson-spring-data-32/pom.xml
Unescape Escape View File

@ -32,7 +32,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-tomcat/redisson-tomcat-10/pom.xml
Unescape Escape View File

@ -38,7 +38,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-tomcat/redisson-tomcat-7/pom.xml
Unescape Escape View File

@ -44,7 +44,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-tomcat/redisson-tomcat-8/pom.xml
Unescape Escape View File

@ -38,7 +38,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

2
redisson-tomcat/redisson-tomcat-9/pom.xml
Unescape Escape View File

@ -38,7 +38,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>

8
redisson/pom.xml
Unescape Escape View File

@ -286,7 +286,7 @@
<dependency> <dependency>
<groupId>com.github.ben-manes.caffeine</groupId> <groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId> <artifactId>caffeine</artifactId>
<version>3.1.1</version> <version>3.1.8</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -406,7 +406,7 @@
<dependency> <dependency>
<groupId>io.projectreactor</groupId> <groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId> <artifactId>reactor-test</artifactId>
<version>3.6.4</version> <version>3.6.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -518,7 +518,7 @@
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>10.15.0</version> <version>10.16.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -547,7 +547,7 @@
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version> <version>3.4.1</version>
<configuration> <configuration>
<archive> <archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

12
redisson/src/main/java/org/redisson/RedissonPatternTopic.java
Unescape Escape View File

@ -22,6 +22,8 @@ import org.redisson.api.listener.PatternStatusListener;
import org.redisson.client.ChannelName; import org.redisson.client.ChannelName;
import org.redisson.client.RedisPubSubListener; import org.redisson.client.RedisPubSubListener;
import org.redisson.client.codec.Codec; import org.redisson.client.codec.Codec;
import org.redisson.client.codec.StringCodec;
import org.redisson.client.protocol.RedisCommands;
import org.redisson.client.protocol.pubsub.PubSubType; import org.redisson.client.protocol.pubsub.PubSubType;
import org.redisson.command.CommandAsyncExecutor; import org.redisson.command.CommandAsyncExecutor;
import org.redisson.misc.CompletableFutureWrapper; import org.redisson.misc.CompletableFutureWrapper;
@ -129,4 +131,14 @@ public class RedissonPatternTopic implements RPatternTopic {
return Collections.singletonList(name); return Collections.singletonList(name);
} }
@Override
public RFuture<List<String>> getActiveTopicsAsync() {
return commandExecutor.writeAsync(name, StringCodec.INSTANCE, RedisCommands.PUBSUB_CHANNELS, name);
}
@Override
public List<String> getActiveTopics() {
return commandExecutor.get(getActiveTopicsAsync());
}
} }

13
redisson/src/main/java/org/redisson/api/RPatternTopic.java
Unescape Escape View File

@ -89,4 +89,17 @@ public interface RPatternTopic {
RFuture<Void> removeListenerAsync(int listenerId); RFuture<Void> removeListenerAsync(int listenerId);
/**
* Returns active topic list of this pattern
* @return all actives channel of this pattern
*/
RFuture<List<String>> getActiveTopicsAsync();
/**
* Returns active topic list of this pattern
* @return all actives topic of this pattern
*/
List<String> getActiveTopics();
} }

7
redisson/src/main/java/org/redisson/api/RPatternTopicReactive.java
Unescape Escape View File

@ -66,4 +66,11 @@ public interface RPatternTopicReactive {
*/ */
Mono<Void> removeListener(int listenerId); Mono<Void> removeListener(int listenerId);
/**
* Returns active topic list of this pattern
* @return all actives channel of this pattern
*/
Mono<List<String>> getActiveTopics();
} }

6
redisson/src/main/java/org/redisson/api/RPatternTopicRx.java
Unescape Escape View File

@ -66,4 +66,10 @@ public interface RPatternTopicRx {
*/ */
void removeListener(int listenerId); void removeListener(int listenerId);
/**
* Returns active topic list of this pattern
* @return all actives topic of this pattern
*/
Single<List<String>> getActiveTopics();
} }

Write Preview
Loading…
Cancel
Save