PAYARA-2395 move reading of properties from the deployment event to f…

…irst use for the application. (#2361)
payara · Feb 2, 2018 · 9401ee2 · 9401ee2
1 parent f12c85b
commit 9401ee2
Showing 1 changed file with 21 additions and 37 deletions.
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
@@ -110,7 +110,7 @@
  */
 @Service(name = "microprofile-config-provider") // this specifies that the classis an HK2 service
 @RunLevel(StartupRunLevel.VAL)
-public class ConfigProviderResolverImpl extends ConfigProviderResolver implements EventListener {
+public class ConfigProviderResolverImpl extends ConfigProviderResolver {
 
     private static final String METADATA_KEY = "MICROPROFILE_APP_CONFIG";
     private static final String CUSTOM_SOURCES_KEY = "MICROPROFILE_CUSTOM_SOURCES";
@@ -127,11 +127,6 @@ public class ConfigProviderResolverImpl extends ConfigProviderResolver implement
     @Inject
     ApplicationRegistry applicationRegistry;
 
-    //Provides access to the event manager to hook into server lifecycle events
-    // or to raise various events
-    @Inject
-    private Events events;
-
     // This injects the configuration from the domain.xml magically
     // and for the correct server configuation
     @Inject
@@ -148,39 +143,8 @@ public ConfigProviderResolverImpl() {
     @PostConstruct
     public void postConstruct() {
         ConfigProviderResolver.setInstance(this);
-
-        // we need to listen for application deployment events so that we can read customer properties etc.
-        events.register(this);
     }
 
-    /**
-     * Event handler needed to capture application load events
-     *
-     * @param event
-     */
-    @Override
-    public void event(Event event) {
-        if (event.is(Deployment.APPLICATION_LOADED)) {
-
-            ApplicationInfo info = (ApplicationInfo) event.hook();
-            LinkedList<Properties> appConfigProperties = new LinkedList<>();
-            info.addTransientAppMetaData(APP_METADATA_KEY, appConfigProperties);
-            try {
-                // Read application defined properties and add as transient metadata
-                Enumeration<URL> resources = info.getAppClassLoader().getResources("META-INF/microprofile-config.properties");
-                while (resources.hasMoreElements()) {
-                    URL url = resources.nextElement();
-                    Properties p = new Properties();
-                    try (InputStream is = url.openStream()) {
-                        p.load(url.openStream());
-                    }
-                    appConfigProperties.add(p);
-                }
-            } catch (IOException ex) {
-                Logger.getLogger(ConfigProviderResolverImpl.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-    }
 
     public MicroprofileConfigConfiguration getMPConfig() {
         if (configuration == null) {
@@ -261,6 +225,7 @@ Config getConfig(ApplicationInfo appInfo) {
             result = appInfo.getTransientAppMetaData(METADATA_KEY, Config.class);
             if (result == null) {
                 // build an application specific configuration
+                initialiseApplicationConfig(appInfo);
                 LinkedList<ConfigSource> sources = new LinkedList<>();
                 LinkedList<Converter> converters = new LinkedList<>();
                 sources.addAll(getDefaultSources());
@@ -433,5 +398,24 @@ List<Converter> getDiscoveredConverters(ApplicationInfo appInfo) {
         }
         return converters;
     }
+
+    private void initialiseApplicationConfig(ApplicationInfo info) {
+        LinkedList<Properties> appConfigProperties = new LinkedList<>();
+        info.addTransientAppMetaData(APP_METADATA_KEY, appConfigProperties);
+        try {
+            // Read application defined properties and add as transient metadata
+            Enumeration<URL> resources = info.getAppClassLoader().getResources("META-INF/microprofile-config.properties");
+            while (resources.hasMoreElements()) {
+                URL url = resources.nextElement();
+                Properties p = new Properties();
+                try (InputStream is = url.openStream()) {
+                    p.load(url.openStream());
+                }
+                appConfigProperties.add(p);
+            }
+        } catch (IOException ex) {
+            Logger.getLogger(ConfigProviderResolverImpl.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
 
 }