Modernize code for diamond operator

* Use `isEmpty()` instead for length for `String` or `Collection`

Author: ngocnhan-tran1996

spring-amqp/src/main/java/org/springframework/amqp/core/AbstractBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2024 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.
@@ -23,6 +23,7 @@
  * Base class for builders supporting arguments.
  *
  * @author Gary Russell
+ * @author Ngoc Nhan
  * @since 1.6
  *
  */
@@ -36,7 +37,7 @@ public abstract class AbstractBuilder {
 	 */
 	protected Map<String, Object> getOrCreateArguments() {
 		if (this.arguments == null) {
-			this.arguments = new LinkedHashMap<String, Object>();
+			this.arguments = new LinkedHashMap<>();
 		}
 		return this.arguments;
 	}

spring-amqp/src/main/java/org/springframework/amqp/core/AbstractDeclarable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -34,6 +34,7 @@
  *
  * @author Gary Russell
  * @author Christian Tzolov
+ * @author Ngoc Nhan
  * @since 1.2
  *
  */
@@ -43,7 +44,7 @@ public abstract class AbstractDeclarable implements Declarable {
 
 	private boolean shouldDeclare = true;
 
-	private Collection<Object> declaringAdmins = new ArrayList<Object>();
+	private Collection<Object> declaringAdmins = new ArrayList<>();
 
 	private boolean ignoreDeclarationExceptions;
 
@@ -63,7 +64,7 @@ public AbstractDeclarable(@Nullable Map<String, Object> arguments) {
 			this.arguments = new HashMap<>(arguments);
 		}
 		else {
-			this.arguments = new HashMap<String, Object>();
+			this.arguments = new HashMap<>();
 		}
 	}
 
@@ -102,7 +103,7 @@ public void setIgnoreDeclarationExceptions(boolean ignoreDeclarationExceptions)
 
 	@Override
 	public void setAdminsThatShouldDeclare(Object... adminArgs) {
-		Collection<Object> admins = new ArrayList<Object>();
+		Collection<Object> admins = new ArrayList<>();
 		if (adminArgs != null) {
 			if (adminArgs.length > 1) {
 				Assert.noNullElements(adminArgs, "'admins' cannot contain null elements");

spring-amqp/src/main/java/org/springframework/amqp/core/BindingBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -30,6 +30,7 @@
  * @author Mark Fisher
  * @author Dave Syer
  * @author Gary Russell
+ * @author Ngoc Nhan
  */
 public final class BindingBuilder {
 
@@ -50,7 +51,7 @@ public static DestinationConfigurer bind(Exchange exchange) {
 	}
 
 	private static Map<String, Object> createMapForKeys(String... keys) {
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 		for (String key : keys) {
 			map.put(key, null);
 		}
@@ -155,7 +156,7 @@ public Binding exists() {
 			}
 
 			public Binding matches(Object value) {
-				Map<String, Object> map = new HashMap<String, Object>();
+				Map<String, Object> map = new HashMap<>();
 				map.put(this.key, value);
 				return new Binding(HeadersExchangeMapConfigurer.this.destination.queue,
 						HeadersExchangeMapConfigurer.this.destination.name,
@@ -194,7 +195,7 @@ public final class HeadersExchangeMapBindingCreator {
 
 			HeadersExchangeMapBindingCreator(Map<String, Object> headerMap, boolean matchAll) {
 				Assert.notEmpty(headerMap, "header map must not be empty");
-				this.headerMap = new HashMap<String, Object>(headerMap);
+				this.headerMap = new HashMap<>(headerMap);
 				this.headerMap.put("x-match", (matchAll ? "all" : "any"));
 			}
 

spring-amqp/src/main/java/org/springframework/amqp/support/SimpleAmqpHeaderMapper.java

@@ -49,6 +49,7 @@
  * @author Artem Bilan
  * @author Stephane Nicoll
  * @author Raylax Grey
+ * @author Ngoc Nhan
  * @since 1.4
  */
 public class SimpleAmqpHeaderMapper extends AbstractHeaderMapper<MessageProperties> implements AmqpHeaderMapper {
@@ -125,7 +126,7 @@ public void fromHeaders(MessageHeaders headers, MessageProperties amqpMessagePro
 
 	@Override
 	public MessageHeaders toHeaders(MessageProperties amqpMessageProperties) {
-		Map<String, Object> headers = new HashMap<String, Object>();
+		Map<String, Object> headers = new HashMap<>();
 		try {
 			BiConsumer<String, Object> putObject = headers::put;
 			BiConsumer<String, String> putString = headers::put;

spring-amqp/src/main/java/org/springframework/amqp/support/converter/AbstractJavaTypeMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -35,6 +35,7 @@
  * @author Sam Nelson
  * @author Andreas Asplund
  * @author Gary Russell
+ * @author Ngoc Nhan
  */
 public abstract class AbstractJavaTypeMapper implements BeanClassLoaderAware {
 
@@ -44,9 +45,9 @@ public abstract class AbstractJavaTypeMapper implements BeanClassLoaderAware {
 
 	public static final String DEFAULT_KEY_CLASSID_FIELD_NAME = "__KeyTypeId__";
 
-	private final Map<String, Class<?>> idClassMapping = new HashMap<String, Class<?>>();
+	private final Map<String, Class<?>> idClassMapping = new HashMap<>();
 
-	private final Map<Class<?>, String> classIdMapping = new HashMap<Class<?>, String>();
+	private final Map<Class<?>, String> classIdMapping = new HashMap<>();
 
 	private ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
 

spring-amqp/src/main/java/org/springframework/amqp/support/converter/AllowedListDeserializingMessageConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2024 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.
@@ -27,12 +27,13 @@
  * MessageConverters that potentially use Java deserialization.
  *
  * @author Gary Russell
+ * @author Ngoc Nhan
  * @since 1.5.5
  *
  */
 public abstract class AllowedListDeserializingMessageConverter extends AbstractMessageConverter {
 
-	private final Set<String> allowedListPatterns = new LinkedHashSet<String>();
+	private final Set<String> allowedListPatterns = new LinkedHashSet<>();
 
 	/**
 	 * Set simple patterns for allowable packages/classes for deserialization.

spring-amqp/src/main/java/org/springframework/amqp/support/converter/ContentTypeDelegatingMessageConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2024 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.
@@ -33,11 +33,12 @@
  * @author Eric Rizzo
  * @author Gary Russell
  * @author Artem Bilan
+ * @author Ngoc Nhan
  * @since 1.4.2
  */
 public class ContentTypeDelegatingMessageConverter implements MessageConverter {
 
-	private final Map<String, MessageConverter> delegates = new HashMap<String, MessageConverter>();
+	private final Map<String, MessageConverter> delegates = new HashMap<>();
 
 	private final MessageConverter defaultConverter;
 

spring-amqp/src/main/java/org/springframework/amqp/support/converter/DefaultJackson2JavaTypeMapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -36,6 +36,7 @@
  * @author Andreas Asplund
  * @author Artem Bilan
  * @author Gary Russell
+ * @author Ngoc Nhan
  */
 public class DefaultJackson2JavaTypeMapper extends AbstractJavaTypeMapper implements Jackson2JavaTypeMapper {
 
@@ -45,7 +46,7 @@ public class DefaultJackson2JavaTypeMapper extends AbstractJavaTypeMapper implem
 					"java.lang"
 			);
 
-	private final Set<String> trustedPackages = new LinkedHashSet<String>(TRUSTED_PACKAGES);
+	private final Set<String> trustedPackages = new LinkedHashSet<>(TRUSTED_PACKAGES);
 
 	private volatile TypePrecedence typePrecedence = TypePrecedence.INFERRED;
 

spring-amqp/src/main/java/org/springframework/amqp/support/postprocessor/DelegatingDecompressingPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2024 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.
@@ -30,11 +30,12 @@
  *
  * @author Gary Russell
  * @author David Diehl
+ * @author Ngoc Nhan
  * @since 1.4.2
  */
 public class DelegatingDecompressingPostProcessor implements MessagePostProcessor, Ordered {
 
-	private final Map<String, MessagePostProcessor> decompressors = new HashMap<String, MessagePostProcessor>();
+	private final Map<String, MessagePostProcessor> decompressors = new HashMap<>();
 
 	private int order;
 

spring-amqp/src/main/java/org/springframework/amqp/support/postprocessor/MessagePostProcessorUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2024 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.
@@ -29,15 +29,16 @@
  * Utilities for message post processors.
  *
  * @author Gary Russell
+ * @author Ngoc Nhan
  * @since 1.4.2
  *
  */
 public final class MessagePostProcessorUtils {
 
 	public static Collection<MessagePostProcessor> sort(Collection<MessagePostProcessor> processors) {
-		List<MessagePostProcessor> priorityOrdered = new ArrayList<MessagePostProcessor>();
-		List<MessagePostProcessor> ordered = new ArrayList<MessagePostProcessor>();
-		List<MessagePostProcessor> unOrdered = new ArrayList<MessagePostProcessor>();
+		List<MessagePostProcessor> priorityOrdered = new ArrayList<>();
+		List<MessagePostProcessor> ordered = new ArrayList<>();
+		List<MessagePostProcessor> unOrdered = new ArrayList<>();
 		for (MessagePostProcessor processor : processors) {
 			if (processor instanceof PriorityOrdered) {
 				priorityOrdered.add(processor);
@@ -49,7 +50,7 @@ else if (processor instanceof Ordered) {
 				unOrdered.add(processor);
 			}
 		}
-		List<MessagePostProcessor> sorted = new ArrayList<MessagePostProcessor>();
+		List<MessagePostProcessor> sorted = new ArrayList<>();
 		OrderComparator.sort(priorityOrdered);
 		sorted.addAll(priorityOrdered);
 		OrderComparator.sort(ordered);