Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
</activation>
<properties>
<lombok.version>1.18.44</lombok.version>
<java-service.version>1.9.0</java-service.version>
<java-service.version>2.0.0</java-service.version>
<java-design.version>1.9.0</java-design.version>
<picocli.version>4.7.7</picocli.version>
</properties>
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/nbbrd/console/properties/ConsoleProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

import internal.console.properties.ConsolePropertiesSpiLoader;
import internal.console.properties.FailsafeConsolePropertiesSpi;
import lombok.NonNull;
import nbbrd.design.ThreadSafe;
import nbbrd.service.Quantifier;
import nbbrd.service.ServiceDefinition;
import nbbrd.service.ServiceFilter;
import nbbrd.service.ServiceSorter;
import lombok.NonNull;
import org.jspecify.annotations.Nullable;

import java.nio.charset.Charset;
Expand All @@ -32,6 +32,8 @@
import java.util.Optional;
import java.util.OptionalInt;

import static java.util.stream.Collectors.toList;

/**
* This class allows to retrieve some console properties such as size and
* encoding.
Expand All @@ -51,7 +53,7 @@ public final class ConsoleProperties {
public static ConsoleProperties ofServiceLoader() {
return ConsoleProperties
.builder()
.providers(new ConsolePropertiesSpiLoader().get())
.providers(ConsolePropertiesSpiLoader.load().stream().map(FailsafeConsolePropertiesSpi::wrap).collect(toList()))
.build();
}

Expand Down Expand Up @@ -121,8 +123,7 @@ private boolean isNotNegative(int value) {
@ThreadSafe
@ServiceDefinition(
loaderName = "internal.console.properties.ConsolePropertiesSpiLoader",
quantifier = Quantifier.MULTIPLE,
wrapper = FailsafeConsolePropertiesSpi.class
quantifier = Quantifier.MULTIPLE
)
public interface Spi {

Expand Down
Loading