Make DirConfigSource retrieve the executor from the global ConfigProv…

…iderResolverImpl instead of explicit dep inject. payara#5006
poikilotherm · Dec 7, 2020 · 763f400 · 763f400
1 parent ccde673
commit 763f400
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...service/src/main/java/fish/payara/nucleus/microprofile/config/source/DirConfigSource.java b/...service/src/main/java/fish/payara/nucleus/microprofile/config/source/DirConfigSource.java
@@ -191,14 +191,14 @@ public void run() {
 
     private static final Logger logger = Logger.getLogger(DirConfigSource.class.getName());
     private Path directory;
-    private ConcurrentHashMap<String, DirProperty> properties = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, DirProperty> properties = new ConcurrentHashMap<>();
 
-    public DirConfigSource(PayaraExecutorService executorService) {
+    public DirConfigSource() {
         try {
             // get the directory from the app server config
             this.directory = findDir();
             // create the watcher for the directory
-            executorService.submit(new DirPropertyWatcher(this.directory));
+            configService.getExecutor().submit(new DirPropertyWatcher(this.directory));
             // initial loading
             initializePropertiesFromPath(this.directory);
         } catch (IOException e) {
@@ -207,7 +207,7 @@ public DirConfigSource(PayaraExecutorService executorService) {
     }
 
     // Used for testing only with explicit dependency injection
-    DirConfigSource(Path directory, PayaraExecutorService executorService) {
+    DirConfigSource(Path directory) {
         super(true);
         this.directory = directory;
         try {

diff --git a/...src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigProviderResolverImpl.java b/...src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigProviderResolverImpl.java
@@ -297,6 +297,10 @@ public ConfigBuilder getBuilder() {
         return new PayaraConfigBuilder(this);
     }
 
+    public PayaraExecutorService getExecutor() {
+        return this.executorService;
+    }
+
     Config getNamedConfig(String applicationName) {
         Config result = null;
         ApplicationInfo info = applicationRegistry.get(applicationName);
@@ -322,7 +326,7 @@ private List<ConfigSource> getDefaultSources(String appName, String moduleName)
         sources.add(new SystemPropertyConfigSource());
         sources.add(new JNDIConfigSource());
         sources.add(new PayaraServerProperties());
-        sources.add(new DirConfigSource(executorService));
+        sources.add(new DirConfigSource());
         sources.add(new PasswordAliasConfigSource());
         sources.add(new JDBCConfigSource());
         if (appName != null) {