-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add option for empty default values (#477)
In Quarkus at static init time we build what is essentially a no-op CP instance, but creating this instance currently incurs some overhead due to the use of Config to look up default values. This change, will allow Quarkus to set empty default values option
- Loading branch information
Showing
6 changed files
with
177 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 10 additions & 87 deletions
97
core/src/main/java/io/smallrye/context/impl/DefaultValues.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,99 +1,22 @@ | ||
| package io.smallrye.context.impl; | ||
|
|
||
| import java.util.HashSet; | ||
| import java.util.NoSuchElementException; | ||
| import java.util.Set; | ||
| public interface DefaultValues { | ||
|
|
||
| import org.eclipse.microprofile.config.Config; | ||
| import org.eclipse.microprofile.config.ConfigProvider; | ||
| String[] getExecutorPropagated(); | ||
|
|
||
| import io.smallrye.context.SmallRyeContextManager; | ||
| import io.smallrye.context.api.ManagedExecutorConfig; | ||
| String[] getExecutorCleared(); | ||
|
|
||
| /** | ||
| * Holds default values for {@code ManagedExecutor} and {@code ThreadContext}. It firstly looks into MP Config | ||
| * for any user-specified defaults and if not defined, then it uses SmallRye defaults which propagate everything. | ||
| * | ||
| * @author Matej Novotny | ||
| */ | ||
| public class DefaultValues { | ||
| int getExecutorAsync(); | ||
|
|
||
| // constants defined by spec for MP Config | ||
| private final String EXEC_ASYNC = "mp.context.ManagedExecutor.maxAsync"; | ||
| private final String EXEC_QUEUE = "mp.context.ManagedExecutor.maxQueued"; | ||
| private final String EXEC_PROPAGATED = "mp.context.ManagedExecutor.propagated"; | ||
| private final String EXEC_CLEARED = "mp.context.ManagedExecutor.cleared"; | ||
| private final String THREAD_CLEARED = "mp.context.ThreadContext.cleared"; | ||
| private final String THREAD_PROPAGATED = "mp.context.ThreadContext.propagated"; | ||
| private final String THREAD_UNCHANGED = "mp.context.ThreadContext.unchanged"; | ||
| int getExecutorQueue(); | ||
|
|
||
| // actual defaults | ||
| private String[] executorPropagated; | ||
| private String[] executorCleared; | ||
| private int executorAsync; | ||
| private int executorQueue; | ||
| private String[] threadPropagated; | ||
| private String[] threadCleared; | ||
| private String[] threadUnchanged; | ||
| String[] getThreadPropagated(); | ||
|
|
||
| public DefaultValues() { | ||
| // NOTE: we do not perform sanity check here, that's done in SmallRyeContextManager | ||
| Config config = ConfigProvider.getConfig(); | ||
| Set<String> allkeys = new HashSet<>(); | ||
| config.getPropertyNames().forEach(item -> allkeys.add(item)); | ||
| this.executorAsync = config.getOptionalValue(EXEC_ASYNC, Integer.class) | ||
| .orElse(ManagedExecutorConfig.Literal.DEFAULT_INSTANCE.maxAsync()); | ||
| this.executorQueue = config.getOptionalValue(EXEC_QUEUE, Integer.class) | ||
| .orElse(ManagedExecutorConfig.Literal.DEFAULT_INSTANCE.maxQueued()); | ||
| // remaining values have to be done via try-catch block because SmallRye Config | ||
| // considers key with empty value as non-existent | ||
| // https://github.com/smallrye/smallrye-config/issues/83 | ||
| this.executorPropagated = resolveConfiguration(config, EXEC_PROPAGATED, SmallRyeContextManager.ALL_REMAINING_ARRAY, | ||
| allkeys); | ||
| this.executorCleared = resolveConfiguration(config, EXEC_CLEARED, SmallRyeContextManager.NO_STRING, allkeys); | ||
| this.threadCleared = resolveConfiguration(config, THREAD_CLEARED, SmallRyeContextManager.NO_STRING, allkeys); | ||
| this.threadPropagated = resolveConfiguration(config, THREAD_PROPAGATED, SmallRyeContextManager.ALL_REMAINING_ARRAY, | ||
| allkeys); | ||
| this.threadUnchanged = resolveConfiguration(config, THREAD_UNCHANGED, SmallRyeContextManager.NO_STRING, allkeys); | ||
| } | ||
|
|
||
| private String[] resolveConfiguration(Config mpConfig, String key, String[] originalValue, Set<String> allKeys) { | ||
| try { | ||
| return mpConfig.getValue(key, String[].class); | ||
| } catch (NoSuchElementException e) { | ||
| // check keys, there still might be a key with no value assigned | ||
| if (allKeys.contains(key)) { | ||
| return new String[] {}; | ||
| } | ||
| return originalValue; | ||
| } | ||
| } | ||
|
|
||
| public String[] getExecutorPropagated() { | ||
| return executorPropagated; | ||
| } | ||
|
|
||
| public String[] getExecutorCleared() { | ||
| return executorCleared; | ||
| } | ||
| String[] getThreadCleared(); | ||
|
|
||
| public int getExecutorAsync() { | ||
| return executorAsync; | ||
| } | ||
|
|
||
| public int getExecutorQueue() { | ||
| return executorQueue; | ||
| } | ||
|
|
||
| public String[] getThreadPropagated() { | ||
| return threadPropagated; | ||
| } | ||
|
|
||
| public String[] getThreadCleared() { | ||
| return threadCleared; | ||
| } | ||
| String[] getThreadUnchanged(); | ||
|
|
||
| public String[] getThreadUnchanged() { | ||
| return threadUnchanged; | ||
| static DefaultValues empty() { | ||
| return EmptyDefaultValues.INSTANCE; | ||
| } | ||
| } |
106 changes: 106 additions & 0 deletions
106
core/src/main/java/io/smallrye/context/impl/DefaultValuesFromConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| package io.smallrye.context.impl; | ||
|
|
||
| import java.util.HashSet; | ||
| import java.util.NoSuchElementException; | ||
| import java.util.Set; | ||
|
|
||
| import org.eclipse.microprofile.config.Config; | ||
| import org.eclipse.microprofile.config.ConfigProvider; | ||
|
|
||
| import io.smallrye.context.SmallRyeContextManager; | ||
| import io.smallrye.context.api.ManagedExecutorConfig; | ||
|
|
||
| /** | ||
| * Holds default values for {@code ManagedExecutor} and {@code ThreadContext}. It firstly looks into MP Config | ||
| * for any user-specified defaults and if not defined, then it uses SmallRye defaults which propagate everything. | ||
| * | ||
| * @author Matej Novotny | ||
| */ | ||
| public class DefaultValuesFromConfig implements DefaultValues { | ||
|
|
||
| // constants defined by spec for MP Config | ||
| private final String EXEC_ASYNC = "mp.context.ManagedExecutor.maxAsync"; | ||
| private final String EXEC_QUEUE = "mp.context.ManagedExecutor.maxQueued"; | ||
| private final String EXEC_PROPAGATED = "mp.context.ManagedExecutor.propagated"; | ||
| private final String EXEC_CLEARED = "mp.context.ManagedExecutor.cleared"; | ||
| private final String THREAD_CLEARED = "mp.context.ThreadContext.cleared"; | ||
| private final String THREAD_PROPAGATED = "mp.context.ThreadContext.propagated"; | ||
| private final String THREAD_UNCHANGED = "mp.context.ThreadContext.unchanged"; | ||
|
|
||
| // actual defaults | ||
| private String[] executorPropagated; | ||
| private String[] executorCleared; | ||
| private int executorAsync; | ||
| private int executorQueue; | ||
| private String[] threadPropagated; | ||
| private String[] threadCleared; | ||
| private String[] threadUnchanged; | ||
|
|
||
| public DefaultValuesFromConfig() { | ||
| // NOTE: we do not perform sanity check here, that's done in SmallRyeContextManager | ||
| Config config = ConfigProvider.getConfig(); | ||
| Set<String> allkeys = new HashSet<>(); | ||
| config.getPropertyNames().forEach(item -> allkeys.add(item)); | ||
| this.executorAsync = config.getOptionalValue(EXEC_ASYNC, Integer.class) | ||
| .orElse(ManagedExecutorConfig.Literal.DEFAULT_INSTANCE.maxAsync()); | ||
| this.executorQueue = config.getOptionalValue(EXEC_QUEUE, Integer.class) | ||
| .orElse(ManagedExecutorConfig.Literal.DEFAULT_INSTANCE.maxQueued()); | ||
| // remaining values have to be done via try-catch block because SmallRye Config | ||
| // considers key with empty value as non-existent | ||
| // https://github.com/smallrye/smallrye-config/issues/83 | ||
| this.executorPropagated = resolveConfiguration(config, EXEC_PROPAGATED, SmallRyeContextManager.ALL_REMAINING_ARRAY, | ||
| allkeys); | ||
| this.executorCleared = resolveConfiguration(config, EXEC_CLEARED, SmallRyeContextManager.NO_STRING, allkeys); | ||
| this.threadCleared = resolveConfiguration(config, THREAD_CLEARED, SmallRyeContextManager.NO_STRING, allkeys); | ||
| this.threadPropagated = resolveConfiguration(config, THREAD_PROPAGATED, SmallRyeContextManager.ALL_REMAINING_ARRAY, | ||
| allkeys); | ||
| this.threadUnchanged = resolveConfiguration(config, THREAD_UNCHANGED, SmallRyeContextManager.NO_STRING, allkeys); | ||
| } | ||
|
|
||
| private String[] resolveConfiguration(Config mpConfig, String key, String[] originalValue, Set<String> allKeys) { | ||
| try { | ||
| return mpConfig.getValue(key, String[].class); | ||
| } catch (NoSuchElementException e) { | ||
| // check keys, there still might be a key with no value assigned | ||
| if (allKeys.contains(key)) { | ||
| return new String[] {}; | ||
| } | ||
| return originalValue; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getExecutorPropagated() { | ||
| return executorPropagated; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getExecutorCleared() { | ||
| return executorCleared; | ||
| } | ||
|
|
||
| @Override | ||
| public int getExecutorAsync() { | ||
| return executorAsync; | ||
| } | ||
|
|
||
| @Override | ||
| public int getExecutorQueue() { | ||
| return executorQueue; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getThreadPropagated() { | ||
| return threadPropagated; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getThreadCleared() { | ||
| return threadCleared; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getThreadUnchanged() { | ||
| return threadUnchanged; | ||
| } | ||
| } |
48 changes: 48 additions & 0 deletions
48
core/src/main/java/io/smallrye/context/impl/EmptyDefaultValues.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package io.smallrye.context.impl; | ||
|
|
||
| import io.smallrye.context.api.ManagedExecutorConfig; | ||
|
|
||
| final class EmptyDefaultValues implements DefaultValues { | ||
|
|
||
| static final EmptyDefaultValues INSTANCE = new EmptyDefaultValues(); | ||
|
|
||
| private static final String[] EMPTY_ARRAY = new String[0]; | ||
|
|
||
| private EmptyDefaultValues() { | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getExecutorPropagated() { | ||
| return EMPTY_ARRAY; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getExecutorCleared() { | ||
| return EMPTY_ARRAY; | ||
| } | ||
|
|
||
| @Override | ||
| public int getExecutorAsync() { | ||
| return ManagedExecutorConfig.Literal.DEFAULT_INSTANCE.maxAsync(); | ||
| } | ||
|
|
||
| @Override | ||
| public int getExecutorQueue() { | ||
| return ManagedExecutorConfig.Literal.DEFAULT_INSTANCE.maxQueued(); | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getThreadPropagated() { | ||
| return EMPTY_ARRAY; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getThreadCleared() { | ||
| return EMPTY_ARRAY; | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getThreadUnchanged() { | ||
| return EMPTY_ARRAY; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters