Fix @value not working in beans declared in gemma-servlet.xml (fix #1001

)
PavlidisLab · Jun 25, 2024 · 3fd1620 · 3fd1620
1 parent 1df06a7
commit 3fd1620
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/gemma-web/src/main/java/ubic/gemma/web/controller/OntologyController.java b/gemma-web/src/main/java/ubic/gemma/web/controller/OntologyController.java
@@ -2,6 +2,7 @@
 
 import lombok.extern.apachecommons.CommonsLog;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -13,7 +14,6 @@
 import ubic.basecode.ontology.model.OntologyTerm;
 import ubic.gemma.core.ontology.FactorValueOntologyService;
 import ubic.gemma.core.ontology.providers.GemmaOntologyService;
-import ubic.gemma.core.config.Settings;
 import ubic.gemma.web.util.EntityNotFoundException;
 import ubic.gemma.web.util.ServiceUnavailableException;
 
@@ -40,12 +40,8 @@ public class OntologyController {
 
     private static final MediaType RDF_XML = MediaType.parseMediaType( "application/rdf+xml" );
 
-    /**
-     * FIXME: use {@link org.springframework.beans.factory.annotation.Value} for injecting this, but I think injection
-     *        is broken in controllers. See <a href="https://github.com/PavlidisLab/Gemma/issues/1001">#1001</a> for
-     *        details.
-     */
-    private static final String hostUrl = Settings.getHostUrl();
+    @Value("${gemma.hosturl}")
+    private String hostUrl;
 
     @Autowired
     private GemmaOntologyService gemmaOntologyService;

diff --git a/gemma-web/src/main/webapp/WEB-INF/gemma-servlet.xml b/gemma-web/src/main/webapp/WEB-INF/gemma-servlet.xml
@@ -18,6 +18,13 @@
         <context:exclude-filter type="annotation" expression="ubic.gemma.core.context.TestComponent"/>
     </context:component-scan>
 
+    <!-- The servlet uses a different Spring context with gemma-core's context as parent -->
+    <!-- Unfortunately, bean post-processor do not get applied, so they must be redeclared here if we want them to apply
+    to controllers -->
+    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
+        <property name="propertySources" ref="settingsPropertySources"/>
+    </bean>
+
     <!-- Mapping URLS to controllers -->