Polishing.

Replace topic label with assertion message. Reorder methods to align with Spring style.

See #2662
Original pull request: #2663

Author: mp911de

src/main/java/org/springframework/data/redis/listener/AbstractTopic.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2023 the original author or authors.
+ * Copyright 2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,19 @@
 package org.springframework.data.redis.listener;
 
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
  * Abstract base class for defining {@link Topic Topics}.
  *
  * @author John Blum
- * @see org.springframework.data.redis.listener.Topic
- * @since 3.2.0
+ * @since 3.1.3
  */
 abstract class AbstractTopic implements Topic {
 
 	private final String name;
 
-	AbstractTopic(String label, String name) {
-		Assert.notNull(name,() -> label + " must not be null");
+	AbstractTopic(String name) {
 		this.name = name;
 	}
 

src/main/java/org/springframework/data/redis/listener/ChannelTopic.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.redis.listener;
 
+import org.springframework.util.Assert;
+
 /**
  * {@link Topic Channel Topic} implementation mapping to a Redis channel.
  *
@@ -25,22 +27,24 @@
 public class ChannelTopic extends AbstractTopic {
 
 	/**
-	 * Create a new {@link ChannelTopic} for channel subscriptions.
+	 * Constructs a new {@link ChannelTopic} instance.
 	 *
-	 * @param channelName {@link String name} of the Redis channel; must not be {@literal null} or {@literal empty}.
-	 * @return the {@link ChannelTopic} for the given {@code channelName}.
-	 * @since 2.1
+	 * @param channelName must not be {@literal null}.
 	 */
-	public static ChannelTopic of(String channelName) {
-		return new ChannelTopic(channelName);
+	public ChannelTopic(String channelName) {
+
+		super(channelName);
+		Assert.notNull(channelName, "Channel name must not be null");
 	}
 
 	/**
-	 * Constructs a new {@link ChannelTopic} instance.
+	 * Create a new {@link ChannelTopic} for channel subscriptions.
 	 *
-	 * @param channelName must not be {@literal null}.
+	 * @param channelName {@link String name} of the Redis channel; must not be {@literal null}.
+	 * @return the {@link ChannelTopic} for the given {@code channelName}.
+	 * @since 2.1
 	 */
-	public ChannelTopic(String channelName) {
-		super("Topic name", channelName);
+	public static ChannelTopic of(String channelName) {
+		return new ChannelTopic(channelName);
 	}
 }

src/main/java/org/springframework/data/redis/listener/PatternTopic.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.redis.listener;
 
+import org.springframework.util.Assert;
+
 /**
  * {@link Topic} {@link String pattern} matching multiple Redis channels.
  *
@@ -25,22 +27,24 @@
 public class PatternTopic extends AbstractTopic {
 
 	/**
-	 * Create a new {@link PatternTopic} for channel subscriptions based on a {@code pattern}.
+	 * Constructs a new {@link PatternTopic} instance.
 	 *
-	 * @param pattern {@link String pattern} used to match channels; must not be {@literal null} or {@literal empty}.
-	 * @return the {@link PatternTopic} for the given {@code pattern}.
-	 * @since 2.1
+	 * @param channelPattern must not be {@literal null}.
 	 */
-	public static PatternTopic of(String pattern) {
-		return new PatternTopic(pattern);
+	public PatternTopic(String channelPattern) {
+
+		super(channelPattern);
+		Assert.notNull(channelPattern, "Pattern must not be null");
 	}
 
 	/**
-	 * Constructs a new {@link PatternTopic} instance.
+	 * Create a new {@link PatternTopic} for channel subscriptions based on a {@code pattern}.
 	 *
-	 * @param channelPattern must not be {@literal null}.
+	 * @param pattern {@link String pattern} used to match channels; must not be {@literal null} or empty.
+	 * @return the {@link PatternTopic} for the given {@code pattern}.
+	 * @since 2.1
 	 */
-	public PatternTopic(String channelPattern) {
-		super("Pattern", channelPattern);
+	public static PatternTopic of(String pattern) {
+		return new PatternTopic(pattern);
 	}
 }