Add auto configure support for Jolokia a JMX-HTTP bridge

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletRegistration;
+
+import org.jolokia.http.AgentServlet;
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory;
+import org.springframework.boot.context.embedded.MockEmbeddedServletContainerFactory.RegisteredServlet;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Tests for {@link JolokiaAutoConfiguration}.
+ * 
+ * @author Christian Dupuis
+ */
+public class JolokiaAutoConfigurationTests {
+
+	private AnnotationConfigEmbeddedWebApplicationContext context;
+
+	@After
+	public void close() {
+		if (this.context != null) {
+			this.context.close();
+		}
+		if (Config.containerFactory != null) {
+			Config.containerFactory = null;
+		}
+	}
+
+	@Test
+	public void agentServletRegisteredWithAppContext() throws Exception {
+		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
+		this.context.register(Config.class, WebMvcAutoConfiguration.class,
+				JolokiaAutoConfiguration.class);
+		this.context.refresh();
+		assertEquals(1, this.context.getBeanNamesForType(AgentServlet.class).length);
+	}
+
+	@Test
+	public void agentServletRegisteredWithServletContainer() throws Exception {
+		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
+		this.context.register(Config.class, WebMvcAutoConfiguration.class,
+				JolokiaAutoConfiguration.class);
+		this.context.refresh();
+
+		Servlet servlet = null;
+		ServletRegistration.Dynamic registration = null;
+		for (RegisteredServlet registeredServlet : Config.containerFactory.getContainer()
+				.getRegisteredServlets()) {
+			if (registeredServlet.getServlet() instanceof AgentServlet) {
+				servlet = registeredServlet.getServlet();
+				registration = registeredServlet.getRegistration();
+			}
+		}
+		assertNotNull(servlet);
+		assertNotNull(registration);
+	}
+
+	@Configuration
+	protected static class Config {
+
+		protected static MockEmbeddedServletContainerFactory containerFactory = null;
+
+		@Bean
+		public EmbeddedServletContainerFactory containerFactory() {
+			if (containerFactory == null) {
+				containerFactory = new MockEmbeddedServletContainerFactory();
+			}
+			return containerFactory;
+		}
+
+		@Bean
+		public EmbeddedServletContainerCustomizerBeanPostProcessor embeddedServletContainerCustomizerBeanPostProcessor() {
+			return new EmbeddedServletContainerCustomizerBeanPostProcessor();
+		}
+
+	}
+
+}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/JolokiaEndpointTests.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.endpoint;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Christian Dupuis
+ */
+public class JolokiaEndpointTests extends AbstractEndpointTests<JolokiaEndpoint> {
+
+	public JolokiaEndpointTests() {
+		super(Config.class, JolokiaEndpoint.class, "/jolokia", true, "endpoints.jolokia");
+	}
+
+	@Configuration
+	@EnableConfigurationProperties
+	public static class Config {
+
+		@Bean
+		public JolokiaEndpoint endpoint() {
+			return new JolokiaEndpoint();
+		}
+
+	}
+}