Restrict automatic beans lookup (no eager it of factory beans)

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / spring / SpringUtils.java

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
index 953d2ecaf67b1895ac0883c02314bb9c5f53eab3..7e01f3235840dffe9093e027c69e4a6fe86cdc35 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/spring/SpringUtils.java
@@ -1,20 +1,70 @@
 package org.argeo.slc.spring;\r
 \r
+import java.io.IOException;\r
+import java.net.URI;\r
+import java.net.URL;\r
 import java.util.Map;\r
 \r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
+import org.argeo.slc.core.SlcException;\r
+import org.springframework.beans.BeanUtils;\r
+import org.springframework.beans.factory.BeanFactoryUtils;\r
 import org.springframework.beans.factory.ListableBeanFactory;\r
+import org.springframework.core.io.DefaultResourceLoader;\r
+import org.springframework.core.io.Resource;\r
 \r
 public class SpringUtils {\r
+       private final static Log log = LogFactory.getLog(SpringUtils.class);\r
+\r
        public static <T> T loadSingleFromContext(ListableBeanFactory context,\r
                        Class<T> clss) {\r
-               Map<String, T> listeners = context.getBeansOfType(clss);\r
-               if (listeners.size() == 1) {\r
-                       return listeners.values().iterator().next();\r
+               // Map<String, T> beans = context.getBeansOfType(clss);\r
+               Map<String, T> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(\r
+                               context, clss, false, false);\r
+               if (beans.size() == 1) {\r
+                       return beans.values().iterator().next();\r
+               } else if (beans.size() > 1) {\r
+                       if (log.isDebugEnabled()) {\r
+                               log\r
+                                               .debug(("Found more that on bean for type " + clss\r
+                                                               + ": " + beans.keySet()));\r
+                       }\r
+                       return null;\r
                } else {\r
                        return null;\r
                }\r
        }\r
 \r
+       public static Resource getParent(Resource res) {\r
+               try {\r
+                       if (res.getURL().getPath().equals("/"))\r
+                               return null;\r
+\r
+                       String urlStr = res.getURL().toString();\r
+                       if (urlStr.charAt(urlStr.length() - 1) == '/')\r
+                               urlStr = urlStr.substring(0, urlStr.length() - 2);\r
+\r
+                       String parentUrlStr = urlStr.substring(0, urlStr.lastIndexOf('/')) + '/';\r
+                       URI uri = new URI(parentUrlStr).normalize();\r
+                       return new DefaultResourceLoader(Thread.currentThread()\r
+                                       .getContextClassLoader()).getResource(uri.toString());\r
+               } catch (Exception e) {\r
+                       throw new SlcException("Cannot get parent for resource " + res, e);\r
+               }\r
+       }\r
+\r
+       public static String extractRelativePath(Resource ancestor, Resource child) {\r
+               try {\r
+\r
+                       return ancestor.getURI().relativize(child.getURI()).normalize()\r
+                                       .toString();\r
+               } catch (IOException e) {\r
+                       throw new SlcException("Cannot extract relative path of " + child\r
+                                       + " based on " + ancestor, e);\r
+               }\r
+       }\r
+\r
        private SpringUtils() {\r
 \r
        }\r