GH-1352: Fix New Sonar Issues

Author: garyrussell

spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/support/StreamMessageProperties.java

@@ -16,12 +16,12 @@
 
 package org.springframework.rabbit.stream.support;
 
+import java.util.Objects;
+
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.lang.Nullable;
 
-import com.rabbitmq.stream.MessageBuilder.PropertiesBuilder;
 import com.rabbitmq.stream.MessageHandler.Context;
-import com.rabbitmq.stream.Properties;
 
 /**
  * {@link MessageProperties} extension for stream messages.
@@ -66,99 +66,128 @@ public Context getContext() {
 	}
 
 	/**
-	 * See {@link Properties#getTo()}.
+	 * See {@link com.rabbitmq.stream.Properties#getTo()}.
 	 * @return the to address.
 	 */
 	public String getTo() {
 		return this.to;
 	}
 
 	/**
-	 * See {@link PropertiesBuilder#to(String)}.
+	 * See {@link com.rabbitmq.stream.MessageBuilder.PropertiesBuilder#to(String)}.
 	 * @param address the address.
 	 */
 	public void setTo(String address) {
 		this.to = address;
 	}
 
 	/**
-	 * See {@link Properties#getSubject()}.
+	 * See {@link com.rabbitmq.stream.Properties#getSubject()}.
 	 * @return the subject.
 	 */
 	public String getSubject() {
 		return this.subject;
 	}
 
 	/**
-	 * See {@link PropertiesBuilder#subject(String)}.
+	 * See {@link com.rabbitmq.stream.MessageBuilder.PropertiesBuilder#subject(String)}.
 	 * @param subject the subject.
 	 */
 	public void setSubject(String subject) {
 		this.subject = subject;
 	}
 
 	/**
-	 * See {@link Properties#getCreationTime()}.
+	 * See {@link com.rabbitmq.stream.Properties#getCreationTime()}.
 	 * @return the creation time.
 	 */
 	public long getCreationTime() {
 		return this.creationTime;
 	}
 
 	/**
-	 * See {@link PropertiesBuilder#creationTime(long)}.
+	 * See
+	 * {@link com.rabbitmq.stream.MessageBuilder.PropertiesBuilder#creationTime(long)}.
 	 * @param creationTime the creation time.
 	 */
 	public void setCreationTime(long creationTime) {
 		this.creationTime = creationTime;
 	}
 
 	/**
-	 * See {@link Properties#getGroupId()}.
+	 * See {@link com.rabbitmq.stream.Properties#getGroupId()}.
 	 * @return the group id.
 	 */
 	public String getGroupId() {
 		return this.groupId;
 	}
 
 	/**
-	 * See {@link PropertiesBuilder#groupId(String)}.
+	 * See {@link com.rabbitmq.stream.MessageBuilder.PropertiesBuilder#groupId(String)}.
 	 * @param groupId the group id.
 	 */
 	public void setGroupId(String groupId) {
 		this.groupId = groupId;
 	}
 
 	/**
-	 * See {@link Properties#getGroupSequence()}.
+	 * See {@link com.rabbitmq.stream.Properties#getGroupSequence()}.
 	 * @return the group sequence.
 	 */
 	public long getGroupSequence() {
 		return this.groupSequence;
 	}
 
 	/**
-	 * See {@link PropertiesBuilder#groupSequence(long)}.
+	 * See
+	 * {@link com.rabbitmq.stream.MessageBuilder.PropertiesBuilder#groupSequence(long)}.
 	 * @param groupSequence the group sequence.
 	 */
 	public void setGroupSequence(long groupSequence) {
 		this.groupSequence = groupSequence;
 	}
 
 	/**
-	 * See {@link Properties#getReplyToGroupId()}.
+	 * See {@link com.rabbitmq.stream.Properties#getReplyToGroupId()}.
 	 * @return the reply to group id.
 	 */
 	public String getReplyToGroupId() {
 		return this.replyToGroupId;
 	}
 
 	/**
-	 * See {@link PropertiesBuilder#replyToGroupId(String)}.
+	 * See
+	 * {@link com.rabbitmq.stream.MessageBuilder.PropertiesBuilder#replyToGroupId(String)}.
 	 * @param replyToGroupId the reply to group id.
 	 */
 	public void setReplyToGroupId(String replyToGroupId) {
 		this.replyToGroupId = replyToGroupId;
 	}
 
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + Objects.hash(creationTime, groupId, groupSequence, replyToGroupId, subject, to);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!super.equals(obj)) {
+			return false;
+		}
+		if (getClass() != obj.getClass()) {
+			return false;
+		}
+		StreamMessageProperties other = (StreamMessageProperties) obj;
+		return this.creationTime == other.creationTime && Objects.equals(this.groupId, other.groupId)
+				&& this.groupSequence == other.groupSequence
+				&& Objects.equals(this.replyToGroupId, other.replyToGroupId)
+				&& Objects.equals(this.subject, other.subject) && Objects.equals(this.to, other.to);
+	}
+
 }

spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/support/converter/DefaultStreamMessageConverter.java

@@ -106,7 +106,7 @@ public com.rabbitmq.stream.Message fromMessage(Message message) throws MessageCo
 		return builder.build();
 	}
 
-	private void mapProp(String key, Object val, ApplicationPropertiesBuilder builder) {
+	private void mapProp(String key, Object val, ApplicationPropertiesBuilder builder) { // NOSONAR - complexity
 		if (val instanceof String) {
 			builder.entry(key, (String) val);
 		}

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/RabbitListenerEndpointRegistry.java

@@ -29,9 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationListener;
@@ -183,15 +181,7 @@ protected MessageListenerContainer createListenerContainer(RabbitListenerEndpoin
 			RabbitListenerContainerFactory<?> factory) {
 
 		MessageListenerContainer listenerContainer = factory.createListenerContainer(endpoint);
-
-		if (listenerContainer instanceof InitializingBean) {
-			try {
-				((InitializingBean) listenerContainer).afterPropertiesSet();
-			}
-			catch (Exception ex) {
-				throw new BeanInitializationException("Failed to initialize message listener container", ex);
-			}
-		}
+		listenerContainer.afterPropertiesSet();
 
 		int containerPhase = listenerContainer.getPhase();
 		if (containerPhase < Integer.MAX_VALUE) {  // a custom phase value