Browse Source

Replace unconventional Optional usages

See gh-44393

Signed-off-by: Johnny Lim <izeye@naver.com>
pull/44505/head
Johnny Lim 11 months ago committed by Stéphane Nicoll
parent
commit
133ecab3cf
  1. 7
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

7
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java

@ -20,7 +20,6 @@ import java.time.Duration; @@ -20,7 +20,6 @@ import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import org.springframework.amqp.core.AcknowledgeMode;
import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory.AddressShuffleMode;
@ -194,7 +193,7 @@ public class RabbitProperties { @@ -194,7 +193,7 @@ public class RabbitProperties {
if (port != null) {
return port;
}
return (Optional.ofNullable(getSsl().getEnabled()).orElse(false)) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
return Boolean.TRUE.equals(getSsl().getEnabled()) ? DEFAULT_PORT_SECURE : DEFAULT_PORT;
}
return this.parsedAddresses.get(0).port;
}
@ -235,7 +234,7 @@ public class RabbitProperties { @@ -235,7 +234,7 @@ public class RabbitProperties {
private List<Address> parseAddresses(List<String> addresses) {
List<Address> parsedAddresses = new ArrayList<>();
for (String address : addresses) {
parsedAddresses.add(new Address(address, Optional.ofNullable(getSsl().getEnabled()).orElse(false)));
parsedAddresses.add(new Address(address, Boolean.TRUE.equals(getSsl().getEnabled())));
}
return parsedAddresses;
}
@ -475,7 +474,7 @@ public class RabbitProperties { @@ -475,7 +474,7 @@ public class RabbitProperties {
* @see #getEnabled() ()
*/
public boolean determineEnabled() {
boolean defaultEnabled = Optional.ofNullable(getEnabled()).orElse(false) || this.bundle != null;
boolean defaultEnabled = Boolean.TRUE.equals(getEnabled()) || this.bundle != null;
if (CollectionUtils.isEmpty(RabbitProperties.this.parsedAddresses)) {
return defaultEnabled;
}

Loading…
Cancel
Save