INT-4035, INT-4008: Docs for Integration Graph

JIRA: https://jira.spring.io/browse/INT-4035, https://jira.spring.io/browse/INT-4008

Polishing

spring-integration-http/src/main/java/org/springframework/integration/http/config/IntegrationGraphControllerRegistrarImportSelector.java

@@ -21,7 +21,6 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.context.annotation.ImportSelector;
 import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.integration.http.support.DefaultHttpHeaderMapper;
 import org.springframework.integration.http.support.HttpContextUtils;
 
 /**
@@ -30,7 +29,7 @@ import org.springframework.integration.http.support.HttpContextUtils;
  */
 class IntegrationGraphControllerRegistrarImportSelector implements ImportSelector {
 
-	private static final Log logger = LogFactory.getLog(DefaultHttpHeaderMapper.class);
+	private static final Log logger = LogFactory.getLog(IntegrationGraphControllerRegistrarImportSelector.class);
 
 	@Override
 	public String[] selectImports(AnnotationMetadata importingClassMetadata) {

spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerParserTests-context.xml

@@ -10,8 +10,14 @@
 		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
-	<mvc:annotation-driven/>
+	<mvc:annotation-driven />
 
-	<graph-controller path="/foo"/>
+	<mvc:cors>
+		<mvc:mapping path="/foo"
+					 allowed-origins="http://foo.bar.com"
+					 allowed-methods="GET" />
+	</mvc:cors>
+
+	<graph-controller path="/foo" />
 
 </beans:beans>

spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java

@@ -36,10 +36,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.config.EnableIntegration;
+import org.springframework.integration.config.EnableIntegrationManagement;
 import org.springframework.integration.http.config.EnableIntegrationGraphController;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -53,7 +56,9 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.HandlerAdapter;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
@@ -80,6 +85,7 @@ public class IntegrationGraphControllerTests {
 	@Test
 	public void testIntegrationGraphGet() throws Exception {
 		this.mockMvc.perform(get("/testIntegration")
+				.header(HttpHeaders.ORIGIN, "http://foo.bar.com")
 				.accept(MediaType.parseMediaType("application/json;charset=UTF-8")))
 				.andExpect(status().isOk())
 				.andExpect(content().contentType("application/json;charset=UTF-8"))
@@ -99,7 +105,6 @@ public class IntegrationGraphControllerTests {
 				"IntegrationGraphControllerParserTests-context.xml", getClass());
 
 
-
 		HandlerMapping handlerMapping =
 				context.getBean(RequestMappingHandlerMapping.class.getName(), HandlerMapping.class);
 
@@ -108,6 +113,7 @@ public class IntegrationGraphControllerTests {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("GET");
 		request.setRequestURI("/foo");
+		request.addHeader(HttpHeaders.ORIGIN, "http://foo.bar.com");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
 		HandlerExecutionChain executionChain = handlerMapping.getHandler(request);
@@ -142,8 +148,19 @@ public class IntegrationGraphControllerTests {
 	@Configuration
 	@EnableWebMvc
 	@EnableIntegration
+	@EnableIntegrationManagement(statsEnabled = "_org.springframework.integration.errorLogger.handler",
+			countsEnabled = "!*",
+			defaultLoggingEnabled = "false")
 	@EnableIntegrationGraphController(path = "/testIntegration")
-	public static class ContextConfiguration {
+	public static class ContextConfiguration extends WebMvcConfigurerAdapter {
+
+		@Override
+		public void addCorsMappings(CorsRegistry registry) {
+			registry.addMapping("/testIntegration/**")
+					.allowedOrigins("http://foo.bar.com")
+					.allowedMethods(HttpMethod.GET.name());
+
+		}
 
 	}