diff --git a/pom.xml b/pom.xml
index f45ce8cb6b..9cd0fbe58c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,7 @@
                     <systemPropertyVariables>
                       <java.security.egd>file:/dev/./urandom</java.security.egd>
                     </systemPropertyVariables>
+					<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/spring-cli/samples/ui.groovy b/spring-cli/samples/ui.groovy
index c5b4049ef7..4e07d9ac59 100644
--- a/spring-cli/samples/ui.groovy
+++ b/spring-cli/samples/ui.groovy
@@ -11,30 +11,25 @@ class Example {
 		model.putAll([title: "My Page", date: new Date(), message: "Hello World"])
 		return "home";
 	}
-
 }
 
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-
 @Configuration
 @Log
 class MvcConfiguration extends WebMvcConfigurerAdapter {
 
-  @Override
-  void addInterceptors(InterceptorRegistry registry) { 
-    log.info("Registering interceptor")
-    registry.addInterceptor(interceptor())
-  }
+	@Override
+	void addInterceptors(InterceptorRegistry registry) {
+		log.info "Registering interceptor"
+		registry.addInterceptor(interceptor())
+	}
 
-  @Bean
-  HandlerInterceptor interceptor() {
-    log.info("Creating interceptor")
-    new HandlerInterceptorAdapter() {
-      @Override
-      void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView mav) { 
-        log.info("Model: " + mav.model)
-      }
-    }
-  }
+	@Bean
+	HandlerInterceptor interceptor() {
+		log.info "Creating interceptor"
+		[
+			postHandle: { request, response, handler, mav ->
+				log.info "Intercepted: model=" + mav.model
+			}
+		] as HandlerInterceptorAdapter
+	}
 }
\ No newline at end of file