Skip to content

Replace unconventional Optional usages #44393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Replace unconventional Optional usages #44393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ...configure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
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;
Expand Down Expand Up @@ -194,7 +193,7 @@ public int determinePort() {
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;
}
Expand Down Expand Up @@ -235,7 +234,7 @@ public void setAddresses(List<String> addresses) {
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;
}
Expand Down Expand Up @@ -475,7 +474,7 @@ public Boolean getEnabled() {
* @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;
}
Expand Down
7 changes: 2 additions & 5 deletions ...ging/structured/StructuredLoggingJsonPropertiesBeanFactoryInitializationAotProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.springframework.boot.logging.structured;

import java.util.Optional;
import java.util.Set;

import org.springframework.aot.generate.GenerationContext;
Expand Down Expand Up @@ -58,10 +57,8 @@ public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableL
}

private static String getCustomStackTracePrinter(StructuredLoggingJsonProperties properties) {
return Optional.ofNullable(properties.stackTrace())
.filter(StackTrace::hasCustomPrinter)
.map(StackTrace::printer)
.orElse(null);
StackTrace stackTrace = properties.stackTrace();
return (stackTrace != null && stackTrace.hasCustomPrinter()) ? stackTrace.printer() : null;

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

}

private static final class AotContribution implements BeanFactoryInitializationAotContribution {
Expand Down