GH-3174: Fix expiration property conversion for AMQP 1.0 module

Similar to: #3174

The `absoluteExpiryTime`, according to the AMQP 1.0 message format, is a timestamp when a message should expire.
The AMQP 0.9.1 deals with a period instead of absolute time.

* Fix `RabbitAmqpUtils` to calculate `expiration` from the difference between
`absoluteExpiryTime` and `creationTime` (which is also absolute).
* Use `System.currentTimeMillis()` if `creationTime` is not provided.
* Fix an `absoluteExpiryTime` calculation based on the `creationTime` and `expiration`

**Auto-cherry-pick to `3.2.x`**

Author: artembilan

spring-rabbitmq-client/src/main/java/org/springframework/amqp/rabbitmq/client/RabbitAmqpUtils.java

@@ -27,6 +27,7 @@
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.utils.JavaUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * The utilities for RabbitMQ AMQP 1.0 protocol API.
@@ -51,11 +52,19 @@ public static Message fromAmqpMessage(com.rabbitmq.client.amqp.Message amqpMessa
 				.acceptIfNotNull(amqpMessage.correlationIdAsString(), messageProperties::setCorrelationId)
 				.acceptIfNotNull(amqpMessage.contentType(), messageProperties::setContentType)
 				.acceptIfNotNull(amqpMessage.contentEncoding(), messageProperties::setContentEncoding)
-				.acceptIfNotNull(amqpMessage.absoluteExpiryTime(),
-						(exp) -> messageProperties.setExpiration(Long.toString(exp)))
-				.acceptIfNotNull(amqpMessage.creationTime(), (time) -> messageProperties.setTimestamp(new Date(time)))
 				.acceptIfNotNull(amqpMessage.replyTo(), messageProperties::setReplyTo);
 
+		long creationTime = amqpMessage.creationTime();
+		if (creationTime <= 0) {
+			creationTime = System.currentTimeMillis();
+		}
+		messageProperties.setTimestamp(new Date(creationTime));
+
+		long absoluteExpiryTime = amqpMessage.absoluteExpiryTime();
+		if (absoluteExpiryTime > creationTime) {
+			messageProperties.setExpiration(Long.toString(absoluteExpiryTime - creationTime));
+		}
+
 		amqpMessage.forEachProperty(messageProperties::setHeader);
 
 		if (context != null) {
@@ -90,20 +99,21 @@ public static void toAmqpMessage(Message message, com.rabbitmq.client.amqp.Messa
 				.priority(messageProperties.getPriority().byteValue());
 
 		Map<String, @Nullable Object> headers = messageProperties.getHeaders();
-		if (!headers.isEmpty()) {
-			headers.forEach((key, val) -> mapProp(key, val, amqpMessage));
-		}
+		headers.forEach((key, val) -> mapProp(key, val, amqpMessage));
 
 		JavaUtils.INSTANCE
 				.acceptOrElseIfNotNull(messageProperties.getCorrelationId(),
 						messageProperties.getMessageId(), amqpMessage::correlationId)
+				.acceptOrElseIfNotNull(messageProperties.getTimestamp(),
+						new Date(), (timestamp) -> amqpMessage.creationTime(timestamp.getTime()))
 				.acceptIfNotNull(messageProperties.getUserId(),
 						(userId) -> amqpMessage.userId(userId.getBytes(StandardCharsets.UTF_8)))
-				.acceptIfNotNull(messageProperties.getReplyTo(), amqpMessage::to)
-				.acceptIfNotNull(messageProperties.getTimestamp(),
-						(timestamp) -> amqpMessage.creationTime(timestamp.getTime()))
-				.acceptIfNotNull(messageProperties.getExpiration(),
-						(expiration) -> amqpMessage.absoluteExpiryTime(Long.parseLong(expiration)));
+				.acceptIfNotNull(messageProperties.getReplyTo(), amqpMessage::to);
+
+		String expiration = messageProperties.getExpiration();
+		if (StringUtils.hasText(expiration)) {
+			amqpMessage.absoluteExpiryTime(amqpMessage.creationTime() + Long.parseLong(expiration));
+		}
 	}
 
 	private static void mapProp(String key, @Nullable Object val, com.rabbitmq.client.amqp.Message amqpMessage) {