use standard java service loader mechanism via ServiceLocator and rem…

…ove pippo.properties files
pippo-java · Oct 26, 2015 · 594ccdc · 594ccdc
1 parent eeff290
commit 594ccdc
Show file tree

Hide file tree

Showing 25 changed files with 14 additions and 52 deletions.
diff --git a/pippo-core/src/main/java/ro/pippo/core/Application.java b/pippo-core/src/main/java/ro/pippo/core/Application.java
@@ -32,20 +32,13 @@
 import ro.pippo.core.route.WebjarsResourceHandler;
 import ro.pippo.core.util.HttpCacheToolkit;
 import ro.pippo.core.util.MimeTypes;
-import ro.pippo.core.util.StringUtils;
+import ro.pippo.core.util.ServiceLocator;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * @author Decebal Suiu
@@ -397,38 +390,7 @@ public static Application get() {
     }
 
     private List<Initializer> getInitializers() {
-        try {
-            List<Initializer> initializers = new ArrayList<>();
-
-            ClassLoader classLoader = getClass().getClassLoader();
-            Enumeration<URL> resources = classLoader.getResources("pippo.properties");
-            while (resources.hasMoreElements()) {
-                URL resource = resources.nextElement();
-                log.debug("Read '{}'", resource.getFile());
-                Properties properties = new Properties();
-                try (Reader reader = new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8)) {
-                    properties.load(reader);
-                } catch (IOException e) {
-                    log.error("Failed to read '{}'", resource.getFile(), e);
-                    continue;
-                }
-
-                String initializerClassName = properties.getProperty("initializer");
-                if (StringUtils.isNullOrEmpty(initializerClassName)) {
-                    log.warn("'{}' does not specify an 'initializer' setting!", resource.getFile());
-                } else {
-                    log.debug("Found initializer '{}'", initializerClassName);
-                    Class<Initializer> initializerClass = (Class<Initializer>) classLoader.loadClass(initializerClassName);
-
-                    Initializer initializer = initializerClass.newInstance();
-                    initializers.add(initializer);
-                }
-            }
-
-            return initializers;
-        } catch (IOException | InstantiationException | IllegalAccessException | ClassNotFoundException e) {
-            throw new PippoRuntimeException("Failed to locate Initializers", e);
-        }
+        return ServiceLocator.locateAll(Initializer.class);
     }
 
     @Override

diff --git a/pippo-fastjson/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-fastjson/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.fastjson.FastjsonInitializer
diff --git a/pippo-fastjson/src/main/resources/pippo.properties b/pippo-fastjson/src/main/resources/pippo.properties
diff --git a/pippo-freemarker/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-freemarker/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.freemarker.FreemarkerInitializer
diff --git a/pippo-freemarker/src/main/resources/pippo.properties b/pippo-freemarker/src/main/resources/pippo.properties
diff --git a/pippo-groovy/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-groovy/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.groovy.GroovyInitializer
diff --git a/pippo-groovy/src/main/resources/pippo.properties b/pippo-groovy/src/main/resources/pippo.properties
diff --git a/pippo-gson/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-gson/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.gson.GsonInitializer
diff --git a/pippo-gson/src/main/resources/pippo.properties b/pippo-gson/src/main/resources/pippo.properties
diff --git a/pippo-jackson/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-jackson/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.jackson.JacksonInitializer
diff --git a/pippo-jackson/src/main/resources/pippo.properties b/pippo-jackson/src/main/resources/pippo.properties
diff --git a/pippo-jade/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-jade/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.jade.JadeInitializer
diff --git a/pippo-jade/src/main/resources/pippo.properties b/pippo-jade/src/main/resources/pippo.properties
diff --git a/pippo-jaxb/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-jaxb/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.jaxb.JaxbInitializer
diff --git a/pippo-jaxb/src/main/resources/pippo.properties b/pippo-jaxb/src/main/resources/pippo.properties
diff --git a/pippo-pebble/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-pebble/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.pebble.PebbleInitializer
diff --git a/pippo-pebble/src/main/resources/pippo.properties b/pippo-pebble/src/main/resources/pippo.properties
diff --git a/pippo-snakeyaml/src/main/resources/pippo.properties b/pippo-snakeyaml/src/main/resources/pippo.properties
diff --git a/pippo-snakeyaml/src/main/resources/services/ro.pippo.core.Initializer b/pippo-snakeyaml/src/main/resources/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.snakeyaml.SnakeYamlInitializer
diff --git a/pippo-trimou/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-trimou/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.trimou.TrimouInitializer
diff --git a/pippo-trimou/src/main/resources/pippo.properties b/pippo-trimou/src/main/resources/pippo.properties
diff --git a/pippo-velocity/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-velocity/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.velocity.VelocityInitializer
diff --git a/pippo-velocity/src/main/resources/pippo.properties b/pippo-velocity/src/main/resources/pippo.properties
diff --git a/pippo-xstream/src/main/resources/META-INF/services/ro.pippo.core.Initializer b/pippo-xstream/src/main/resources/META-INF/services/ro.pippo.core.Initializer
@@ -0,0 +1 @@
+ro.pippo.xstream.XstreamInitializer
diff --git a/pippo-xstream/src/main/resources/pippo.properties b/pippo-xstream/src/main/resources/pippo.properties