14017 - refactor - do not set the application context on beans that are already context aware

Author: jdaugherty

grails-gsp/grails-layout/src/main/groovy/org/apache/grails/web/layout/EmbeddedGrailsLayoutViewResolver.java

@@ -25,9 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.Ordered;
 import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.servlet.SmartView;
@@ -36,7 +33,7 @@
 
 import org.grails.web.servlet.view.LayoutViewResolver;
 
-public class EmbeddedGrailsLayoutViewResolver implements LayoutViewResolver, Ordered, ServletContextAware, ApplicationContextAware {
+public class EmbeddedGrailsLayoutViewResolver implements LayoutViewResolver, Ordered, ServletContextAware {
 
     private static final Logger LOG = LoggerFactory.getLogger(EmbeddedGrailsLayoutViewResolver.class);
 
@@ -91,16 +88,6 @@ public void setOrder(int order) {
     @Override
     public void setServletContext(ServletContext servletContext) {
         this.servletContext = servletContext;
-        if (innerViewResolver instanceof ServletContextAware) {
-            ((ServletContextAware) innerViewResolver).setServletContext(servletContext);
-        }
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if (innerViewResolver instanceof ApplicationContextAware) {
-            ((ApplicationContextAware) innerViewResolver).setApplicationContext(applicationContext);
-        }
     }
 
     public void setInnerViewResolver(ViewResolver innerViewResolver) {