O3-3347: Follow-up; don't use mvc:annotation-driven (#61)

omod/src/main/java/org/openmrs/module/spa/spring/SpaBeanPostProcessor.java

@@ -0,0 +1,27 @@
+package org.openmrs.module.spa.spring;
+
+import org.openmrs.module.spa.SpaResourceConverter;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
+
+public class SpaBeanPostProcessor implements BeanPostProcessor, ApplicationContextAware {
+
+    private ApplicationContext applicationContext;
+
+    @Override
+    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+        if (bean instanceof RequestMappingHandlerAdapter) {
+            RequestMappingHandlerAdapter handlerMappingAdapter = (RequestMappingHandlerAdapter) bean;
+            handlerMappingAdapter.getMessageConverters().add(0, applicationContext.getBean(SpaResourceConverter.class));
+        }
+        return bean;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
+}

omod/src/main/resources/webModuleApplicationContext.xml

@@ -18,10 +18,6 @@
     <context:annotation-config />
     <bean id="spaResourceLoader" class="org.openmrs.module.spa.SpaResourceLoader" />
     <bean class="org.openmrs.module.spa.SpaController" />
-
-    <mvc:annotation-driven>
-        <mvc:message-converters>
-            <bean class="org.openmrs.module.spa.SpaResourceConverter" />
-        </mvc:message-converters>
-    </mvc:annotation-driven>
+    <bean class="org.openmrs.module.spa.SpaResourceConverter" />
+    <bean class="org.openmrs.module.spa.spring.SpaBeanPostProcessor" />
 </beans>