Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfiguration.java

@@ -79,7 +79,7 @@ public class EndpointWebMvcManagementContextConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public EndpointHandlerMapping endpointHandlerMapping() {
-		Set<? extends MvcEndpoint> endpoints = mvcEndpoints().getEndpoints();
+		Set<MvcEndpoint> endpoints = mvcEndpoints().getEndpoints();
 		CorsConfiguration corsConfiguration = getCorsConfiguration(this.corsProperties);
 		EndpointHandlerMapping mapping = new EndpointHandlerMapping(endpoints,
 				corsConfiguration);

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2012-2016 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.cloudfoundry;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration;
+import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints;
+import org.springframework.boot.actuate.endpoint.mvc.NamedMvcEndpoint;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.cloud.CloudPlatform;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} to expose actuator endpoints for
+ * cloud foundry to use.
+ *
+ * @author Madhura Bhave
+ * @since 1.5.0
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = false)
+@ConditionalOnBean(MvcEndpoints.class)
+@AutoConfigureAfter(EndpointWebMvcAutoConfiguration.class)
+@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
+public class CloudFoundryActuatorAutoConfiguration {
+
+	@Bean
+	public CloudFoundryEndpointHandlerMapping cloudFoundryEndpointHandlerMapping(
+			MvcEndpoints mvcEndpoints) {
+		Set<NamedMvcEndpoint> endpoints = new LinkedHashSet<NamedMvcEndpoint>(
+				mvcEndpoints.getEndpoints(NamedMvcEndpoint.class));
+		CloudFoundryEndpointHandlerMapping mapping = new CloudFoundryEndpointHandlerMapping(
+				endpoints, getCorsConfiguration());
+		mapping.setPrefix("/cloudfoundryapplication");
+		return mapping;
+	}
+
+	private CorsConfiguration getCorsConfiguration() {
+		CorsConfiguration corsConfiguration = new CorsConfiguration();
+		corsConfiguration.addAllowedOrigin(CorsConfiguration.ALL);
+		return corsConfiguration;
+	}
+
+}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpoint.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012-2016 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.cloudfoundry;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.boot.actuate.endpoint.mvc.AbstractMvcEndpoint;
+import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
+import org.springframework.boot.actuate.endpoint.mvc.NamedMvcEndpoint;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * {@link MvcEndpoint} to expose HAL-formatted JSON for Cloud Foundry specific actuator
+ * endpoints.
+ *
+ * @author Madhura Bhave
+ */
+class CloudFoundryDiscoveryMvcEndpoint extends AbstractMvcEndpoint {
+
+	private final Set<NamedMvcEndpoint> endpoints;
+
+	CloudFoundryDiscoveryMvcEndpoint(Set<NamedMvcEndpoint> endpoints) {
+		super("", false);
+		this.endpoints = endpoints;
+	}
+
+	@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+	@ResponseBody
+	public Map<String, Map<String, Link>> links(HttpServletRequest request) {
+		Map<String, Link> links = new LinkedHashMap<String, Link>();
+		String url = request.getRequestURL().toString();
+		if (url.endsWith("/")) {
+			url = url.substring(0, url.length() - 1);
+		}
+		links.put("self", Link.withHref(url));
+		for (NamedMvcEndpoint endpoint : this.endpoints) {
+			links.put(endpoint.getName(), Link.withHref(url + "/" + endpoint.getName()));
+		}
+		return Collections.singletonMap("_links", links);
+	}
+
+	/**
+	 * Details for a link in the HAL response.
+	 */
+	static class Link {
+
+		private String href;
+
+		public String getHref() {
+			return this.href;
+		}
+
+		public void setHref(String href) {
+			this.href = href;
+		}
+
+		static Link withHref(Object href) {
+			Link link = new Link();
+			link.setHref(href.toString());
+			return link;
+		}
+
+	}
+
+}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMapping.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2012-2016 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.cloudfoundry;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.boot.actuate.endpoint.mvc.AbstractEndpointHandlerMapping;
+import org.springframework.boot.actuate.endpoint.mvc.HalJsonMvcEndpoint;
+import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
+import org.springframework.boot.actuate.endpoint.mvc.NamedMvcEndpoint;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.servlet.HandlerExecutionChain;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+/**
+ * {@link HandlerMapping} to map {@link Endpoint}s to Cloud Foundry specific URLs.
+ *
+ * @author Madhura Bhave
+ */
+class CloudFoundryEndpointHandlerMapping
+		extends AbstractEndpointHandlerMapping<NamedMvcEndpoint> {
+
+	CloudFoundryEndpointHandlerMapping(Collection<? extends NamedMvcEndpoint> endpoints) {
+		super(endpoints);
+	}
+
+	CloudFoundryEndpointHandlerMapping(Set<NamedMvcEndpoint> endpoints,
+			CorsConfiguration corsConfiguration) {
+		super(endpoints, corsConfiguration);
+	}
+
+	@Override
+	protected void postProcessEndpoints(Set<NamedMvcEndpoint> endpoints) {
+		super.postProcessEndpoints(endpoints);
+		Iterator<NamedMvcEndpoint> iterator = endpoints.iterator();
+		while (iterator.hasNext()) {
+			if (iterator.next() instanceof HalJsonMvcEndpoint) {
+				iterator.remove();
+			}
+		}
+	}
+
+	@Override
+	public void afterPropertiesSet() {
+		super.afterPropertiesSet();
+		detectHandlerMethods(new CloudFoundryDiscoveryMvcEndpoint(getEndpoints()));
+	}
+
+	@Override
+	protected String getPath(MvcEndpoint endpoint) {
+		if (endpoint instanceof NamedMvcEndpoint) {
+			return "/" + ((NamedMvcEndpoint) endpoint).getName();
+		}
+		return super.getPath(endpoint);
+	}
+
+	@Override
+	protected HandlerExecutionChain getHandlerExecutionChain(Object handler,
+			HttpServletRequest request) {
+		HandlerExecutionChain chain = super.getHandlerExecutionChain(handler, request);
+		HandlerInterceptor[] interceptors = addSecurityInterceptor(
+				chain.getInterceptors());
+		return new HandlerExecutionChain(chain.getHandler(), interceptors);
+	}
+
+	private HandlerInterceptor[] addSecurityInterceptor(HandlerInterceptor[] existing) {
+		List<HandlerInterceptor> interceptors = new ArrayList<HandlerInterceptor>();
+		interceptors.add(new SecurityInterceptor());
+		if (existing != null) {
+			interceptors.addAll(Arrays.asList(existing));
+		}
+		return interceptors.toArray(new HandlerInterceptor[interceptors.size()]);
+	}
+
+	/**
+	 * Security interceptor to check cloud foundry token.
+	 */
+	static class SecurityInterceptor extends HandlerInterceptorAdapter {
+
+		@Override
+		public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
+				Object handler) throws Exception {
+			// Currently open
+			return true;
+		}
+
+	}
+}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMapping.java

@@ -0,0 +1,235 @@
+/*
+ * Copyright 2012-2015 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.mvc;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.context.ApplicationContext;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+/**
+ * {@link HandlerMapping} to map {@link Endpoint}s to URLs via {@link Endpoint#getId()}.
+ * The semantics of {@code @RequestMapping} should be identical to a normal
+ * {@code @Controller}, but the endpoints should not be annotated as {@code @Controller}
+ * (otherwise they will be mapped by the normal MVC mechanisms).
+ * <p>
+ * One of the aims of the mapping is to support endpoints that work as HTTP endpoints but
+ * can still provide useful service interfaces when there is no HTTP server (and no Spring
+ * MVC on the classpath). Note that any endpoints having method signatures will break in a
+ * non-servlet environment.
+ *
+ * @param <E> The endpoint type
+ * @author Phillip Webb
+ * @author Christian Dupuis
+ * @author Dave Syer
+ * @author Madhura Bhave
+ */
+public class AbstractEndpointHandlerMapping<E extends MvcEndpoint>
+		extends RequestMappingHandlerMapping {
+
+	private final Set<E> endpoints;
+
+	private final CorsConfiguration corsConfiguration;
+
+	private String prefix = "";
+
+	private boolean disabled = false;
+
+	/**
+	 * Create a new {@link AbstractEndpointHandlerMapping} instance. All {@link Endpoint}s
+	 * will be detected from the {@link ApplicationContext}. The endpoints will not accept
+	 * CORS requests.
+	 * @param endpoints the endpoints
+	 */
+	public AbstractEndpointHandlerMapping(Collection<? extends E> endpoints) {
+		this(endpoints, null);
+	}
+
+	/**
+	 * Create a new {@link AbstractEndpointHandlerMapping} instance. All {@link Endpoint}s
+	 * will be detected from the {@link ApplicationContext}. The endpoints will accepts
+	 * CORS requests based on the given {@code corsConfiguration}.
+	 * @param endpoints the endpoints
+	 * @param corsConfiguration the CORS configuration for the endpoints
+	 * @since 1.3.0
+	 */
+	public AbstractEndpointHandlerMapping(Collection<? extends E> endpoints,
+			CorsConfiguration corsConfiguration) {
+		this.endpoints = new HashSet<E>(endpoints);
+		postProcessEndpoints(this.endpoints);
+		this.corsConfiguration = corsConfiguration;
+		// By default the static resource handler mapping is LOWEST_PRECEDENCE - 1
+		// and the RequestMappingHandlerMapping is 0 (we ideally want to be before both)
+		setOrder(-100);
+		setUseSuffixPatternMatch(false);
+	}
+
+	/**
+	 * Post process the endpoint setting before they are used. Subclasses can add or
+	 * modify the endpoints as necessary.
+	 * @param endpoints the endpoints to post process
+	 */
+	protected void postProcessEndpoints(Set<E> endpoints) {
+	}
+
+	@Override
+	public void afterPropertiesSet() {
+		super.afterPropertiesSet();
+		if (!this.disabled) {
+			for (MvcEndpoint endpoint : this.endpoints) {
+				detectHandlerMethods(endpoint);
+			}
+		}
+	}
+
+	/**
+	 * Since all handler beans are passed into the constructor there is no need to detect
+	 * anything here.
+	 */
+	@Override
+	protected boolean isHandler(Class<?> beanType) {
+		return false;
+	}
+
+	@Override
+	@Deprecated
+	protected void registerHandlerMethod(Object handler, Method method,
+			RequestMappingInfo mapping) {
+		if (mapping == null) {
+			return;
+		}
+		String[] patterns = getPatterns(handler, mapping);
+		if (!ObjectUtils.isEmpty(patterns)) {
+			super.registerHandlerMethod(handler, method,
+					withNewPatterns(mapping, patterns));
+		}
+	}
+
+	private String[] getPatterns(Object handler, RequestMappingInfo mapping) {
+		if (handler instanceof String) {
+			handler = getApplicationContext().getBean((String) handler);
+		}
+		Assert.state(handler instanceof MvcEndpoint, "Only MvcEndpoints are supported");
+		String path = getPath((MvcEndpoint) handler);
+		return (path == null ? null : getEndpointPatterns(path, mapping));
+	}
+
+	/**
+	 * Return the path that should be used to map the given {@link MvcEndpoint}.
+	 * @param endpoint the endpoint to map
+	 * @return the path to use for the endpoint or {@code null} if no mapping is required
+	 */
+	protected String getPath(MvcEndpoint endpoint) {
+		return endpoint.getPath();
+	}
+
+	private String[] getEndpointPatterns(String path, RequestMappingInfo mapping) {
+		String patternPrefix = StringUtils.hasText(this.prefix) ? this.prefix + path
+				: path;
+		Set<String> defaultPatterns = mapping.getPatternsCondition().getPatterns();
+		if (defaultPatterns.isEmpty()) {
+			return new String[] { patternPrefix, patternPrefix + ".json" };
+		}
+		List<String> patterns = new ArrayList<String>(defaultPatterns);
+		for (int i = 0; i < patterns.size(); i++) {
+			patterns.set(i, patternPrefix + patterns.get(i));
+		}
+		return patterns.toArray(new String[patterns.size()]);
+	}
+
+	private RequestMappingInfo withNewPatterns(RequestMappingInfo mapping,
+			String[] patternStrings) {
+		PatternsRequestCondition patterns = new PatternsRequestCondition(patternStrings,
+				null, null, useSuffixPatternMatch(), useTrailingSlashMatch(), null);
+		return new RequestMappingInfo(patterns, mapping.getMethodsCondition(),
+				mapping.getParamsCondition(), mapping.getHeadersCondition(),
+				mapping.getConsumesCondition(), mapping.getProducesCondition(),
+				mapping.getCustomCondition());
+	}
+
+	/**
+	 * Set the prefix used in mappings.
+	 * @param prefix the prefix
+	 */
+	public void setPrefix(String prefix) {
+		Assert.isTrue("".equals(prefix) || StringUtils.startsWithIgnoreCase(prefix, "/"),
+				"prefix must start with '/'");
+		this.prefix = prefix;
+	}
+
+	/**
+	 * Get the prefix used in mappings.
+	 * @return the prefix
+	 */
+	public String getPrefix() {
+		return this.prefix;
+	}
+
+	/**
+	 * Get the path of the endpoint.
+	 * @param endpoint the endpoint
+	 * @return the path used in mappings
+	 */
+	public String getPath(String endpoint) {
+		return this.prefix + endpoint;
+	}
+
+	/**
+	 * Sets if this mapping is disabled.
+	 * @param disabled if the mapping is disabled
+	 */
+	public void setDisabled(boolean disabled) {
+		this.disabled = disabled;
+	}
+
+	/**
+	 * Returns if this mapping is disabled.
+	 * @return if the mapping is disabled
+	 */
+	public boolean isDisabled() {
+		return this.disabled;
+	}
+
+	/**
+	 * Return the endpoints.
+	 * @return the endpoints
+	 */
+	public Set<E> getEndpoints() {
+		return Collections.unmodifiableSet(this.endpoints);
+	}
+
+	@Override
+	protected CorsConfiguration initCorsConfiguration(Object handler, Method method,
+			RequestMappingInfo mappingInfo) {
+		return this.corsConfiguration;
+	}
+
+}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java

@@ -16,24 +16,12 @@
 
 package org.springframework.boot.actuate.endpoint.mvc;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.context.ApplicationContext;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
-import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
-import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
 /**
  * {@link HandlerMapping} to map {@link Endpoint}s to URLs via {@link Endpoint#getId()}.
@@ -50,15 +38,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
  * @author Christian Dupuis
  * @author Dave Syer
  */
-public class EndpointHandlerMapping extends RequestMappingHandlerMapping {
-
-	private final Set<MvcEndpoint> endpoints;
-
-	private final CorsConfiguration corsConfiguration;
-
-	private String prefix = "";
-
-	private boolean disabled = false;
+public class EndpointHandlerMapping extends AbstractEndpointHandlerMapping<MvcEndpoint> {
 
 	/**
 	 * Create a new {@link EndpointHandlerMapping} instance. All {@link Endpoint}s will be
@@ -67,7 +47,7 @@ public class EndpointHandlerMapping extends RequestMappingHandlerMapping {
 	 * @param endpoints the endpoints
 	 */
 	public EndpointHandlerMapping(Collection<? extends MvcEndpoint> endpoints) {
-		this(endpoints, null);
+		super(endpoints);
 	}
 
 	/**
@@ -80,164 +60,7 @@ public class EndpointHandlerMapping extends RequestMappingHandlerMapping {
 	 */
 	public EndpointHandlerMapping(Collection<? extends MvcEndpoint> endpoints,
 			CorsConfiguration corsConfiguration) {
-		this.endpoints = new HashSet<MvcEndpoint>(endpoints);
-		this.corsConfiguration = corsConfiguration;
-		// By default the static resource handler mapping is LOWEST_PRECEDENCE - 1
-		// and the RequestMappingHandlerMapping is 0 (we ideally want to be before both)
-		setOrder(-100);
-		setUseSuffixPatternMatch(false);
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		super.afterPropertiesSet();
-		if (!this.disabled) {
-			for (MvcEndpoint endpoint : this.endpoints) {
-				detectHandlerMethods(endpoint);
-			}
-		}
-	}
-
-	/**
-	 * Since all handler beans are passed into the constructor there is no need to detect
-	 * anything here.
-	 */
-	@Override
-	protected boolean isHandler(Class<?> beanType) {
-		return false;
-	}
-
-	@Override
-	@Deprecated
-	protected void registerHandlerMethod(Object handler, Method method,
-			RequestMappingInfo mapping) {
-		if (mapping == null) {
-			return;
-		}
-		String[] patterns = getPatterns(handler, mapping);
-		if (!ObjectUtils.isEmpty(patterns)) {
-			super.registerHandlerMethod(handler, method,
-					withNewPatterns(mapping, patterns));
-		}
-	}
-
-	private String[] getPatterns(Object handler, RequestMappingInfo mapping) {
-		if (handler instanceof String) {
-			handler = getApplicationContext().getBean((String) handler);
-		}
-		Assert.state(handler instanceof MvcEndpoint, "Only MvcEndpoints are supported");
-		String path = getPath((MvcEndpoint) handler);
-		return (path == null ? null : getEndpointPatterns(path, mapping));
-	}
-
-	/**
-	 * Return the path that should be used to map the given {@link MvcEndpoint}.
-	 * @param endpoint the endpoint to map
-	 * @return the path to use for the endpoint or {@code null} if no mapping is required
-	 */
-	protected String getPath(MvcEndpoint endpoint) {
-		return endpoint.getPath();
-	}
-
-	private String[] getEndpointPatterns(String path, RequestMappingInfo mapping) {
-		String patternPrefix = StringUtils.hasText(this.prefix) ? this.prefix + path
-				: path;
-		Set<String> defaultPatterns = mapping.getPatternsCondition().getPatterns();
-		if (defaultPatterns.isEmpty()) {
-			return new String[] { patternPrefix, patternPrefix + ".json" };
-		}
-		List<String> patterns = new ArrayList<String>(defaultPatterns);
-		for (int i = 0; i < patterns.size(); i++) {
-			patterns.set(i, patternPrefix + patterns.get(i));
-		}
-		return patterns.toArray(new String[patterns.size()]);
-	}
-
-	private RequestMappingInfo withNewPatterns(RequestMappingInfo mapping,
-			String[] patternStrings) {
-		PatternsRequestCondition patterns = new PatternsRequestCondition(patternStrings,
-				null, null, useSuffixPatternMatch(), useTrailingSlashMatch(), null);
-		return new RequestMappingInfo(patterns, mapping.getMethodsCondition(),
-				mapping.getParamsCondition(), mapping.getHeadersCondition(),
-				mapping.getConsumesCondition(), mapping.getProducesCondition(),
-				mapping.getCustomCondition());
-	}
-
-	/**
-	 * Set the prefix used in mappings.
-	 * @param prefix the prefix
-	 */
-	public void setPrefix(String prefix) {
-		Assert.isTrue("".equals(prefix) || StringUtils.startsWithIgnoreCase(prefix, "/"),
-				"prefix must start with '/'");
-		this.prefix = prefix;
-	}
-
-	/**
-	 * Get the prefix used in mappings.
-	 * @return the prefix
-	 */
-	public String getPrefix() {
-		return this.prefix;
-	}
-
-	/**
-	 * Get the path of the endpoint.
-	 * @param endpoint the endpoint
-	 * @return the path used in mappings
-	 */
-	public String getPath(String endpoint) {
-		return this.prefix + endpoint;
-	}
-
-	/**
-	 * Sets if this mapping is disabled.
-	 * @param disabled if the mapping is disabled
-	 */
-	public void setDisabled(boolean disabled) {
-		this.disabled = disabled;
-	}
-
-	/**
-	 * Returns if this mapping is disabled.
-	 * @return if the mapping is disabled
-	 */
-	public boolean isDisabled() {
-		return this.disabled;
-	}
-
-	/**
-	 * Return the endpoints.
-	 * @return the endpoints
-	 * @see #getEndpoints(Class)
-	 */
-	public Set<? extends MvcEndpoint> getEndpoints() {
-		return getEndpoints(MvcEndpoint.class);
-	}
-
-	/**
-	 * Return the endpoints of the specified type.
-	 * @param <E> the endpoint type
-	 * @param type the endpoint type
-	 * @return the endpoints
-	 * @see #getEndpoints()
-	 * @since 1.5.0
-	 */
-	@SuppressWarnings("unchecked")
-	public <E extends MvcEndpoint> Set<E> getEndpoints(Class<E> type) {
-		Set<E> result = new HashSet<E>(this.endpoints.size());
-		for (MvcEndpoint candidate : this.endpoints) {
-			if (type.isInstance(candidate)) {
-				result.add((E) candidate);
-			}
-		}
-		return Collections.unmodifiableSet(result);
-	}
-
-	@Override
-	protected CorsConfiguration initCorsConfiguration(Object handler, Method method,
-			RequestMappingInfo mappingInfo) {
-		return this.corsConfiguration;
+		super(endpoints, corsConfiguration);
 	}
 
 }

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java

@@ -17,6 +17,7 @@
 package org.springframework.boot.actuate.endpoint.mvc;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -88,10 +89,27 @@ public class MvcEndpoints implements ApplicationContextAware, InitializingBean {
 		return types;
 	}
 
-	public Set<? extends MvcEndpoint> getEndpoints() {
+	public Set<MvcEndpoint> getEndpoints() {
 		return this.endpoints;
 	}
 
+	/**
+	 * Return the endpoints of the specified type.
+	 * @param <E> the Class type of the endpoints to be returned
+	 * @param type the endpoint type
+	 * @return the endpoints
+	 */
+	@SuppressWarnings("unchecked")
+	public <E extends MvcEndpoint> Set<E> getEndpoints(Class<E> type) {
+		Set<E> result = new HashSet<E>(this.endpoints.size());
+		for (MvcEndpoint candidate : this.endpoints) {
+			if (type.isInstance(candidate)) {
+				result.add((E) candidate);
+			}
+		}
+		return Collections.unmodifiableSet(result);
+	}
+
 	private boolean isGenericEndpoint(Class<?> type) {
 		return !this.customTypes.contains(type)
 				&& !MvcEndpoint.class.isAssignableFrom(type);

spring-boot-actuator/src/main/resources/META-INF/spring.factories

@@ -16,7 +16,8 @@ org.springframework.boot.actuate.autoconfigure.MetricsChannelAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.MetricExportAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.PublicMetricsAutoConfiguration,\
 org.springframework.boot.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\
-org.springframework.boot.actuate.autoconfigure.TraceWebFilterAutoConfiguration
+org.springframework.boot.actuate.autoconfigure.TraceWebFilterAutoConfiguration,\
+org.springframework.boot.actuate.cloudfoundry.CloudFoundryActuatorAutoConfiguration
 
 org.springframework.boot.actuate.autoconfigure.ManagementContextConfiguration=\
 org.springframework.boot.actuate.autoconfigure.EndpointWebMvcManagementContextConfiguration,\

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2012-2016 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.cloudfoundry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcManagementContextConfiguration;
+import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.ManagementWebSecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.HttpMessageConvertersAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.boot.test.util.EnvironmentTestUtils;
+import org.springframework.mock.web.MockServletContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link CloudFoundryActuatorAutoConfiguration}.
+ *
+ * @author Madhura Bhave
+ */
+public class CloudFoundryActuatorAutoConfigurationTests {
+
+	private AnnotationConfigWebApplicationContext context;
+
+	@Before
+	public void setUp() {
+		this.context = new AnnotationConfigWebApplicationContext();
+		this.context.setServletContext(new MockServletContext());
+		this.context.register(SecurityAutoConfiguration.class,
+				WebMvcAutoConfiguration.class,
+				ManagementWebSecurityAutoConfiguration.class,
+				JacksonAutoConfiguration.class,
+				HttpMessageConvertersAutoConfiguration.class,
+				EndpointAutoConfiguration.class, EndpointWebMvcAutoConfiguration.class,
+				ManagementServerPropertiesAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class,
+				EndpointWebMvcManagementContextConfiguration.class,
+				CloudFoundryActuatorAutoConfiguration.class);
+	}
+
+	@After
+	public void close() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void cloudFoundryPlatformActive() throws Exception {
+		EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---",
+				"management.cloudfoundry.enabled:true");
+		this.context.refresh();
+		CloudFoundryEndpointHandlerMapping handlerMapping = this.context.getBean(
+				"cloudFoundryEndpointHandlerMapping",
+				CloudFoundryEndpointHandlerMapping.class);
+		assertThat(handlerMapping.getPrefix()).isEqualTo("/cloudfoundryapplication");
+	}
+
+	@Test
+	public void cloudFoundryPlatformInactive() throws Exception {
+		this.context.refresh();
+		assertThat(this.context.containsBean("cloudFoundryEndpointHandlerMapping"))
+				.isFalse();
+	}
+
+	@Test
+	public void cloudFoundryManagementEndpointsDisabled() throws Exception {
+		EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION=---",
+				"management.cloudfoundry.enabled:false");
+		this.context.refresh();
+		assertThat(this.context.containsBean("cloudFoundryEndpointHandlerMapping"))
+				.isFalse();
+	}
+
+}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpointTests.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2012-2016 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.cloudfoundry;
+
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
+import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
+import org.springframework.boot.actuate.endpoint.mvc.NamedMvcEndpoint;
+import org.springframework.mock.web.MockHttpServletRequest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link CloudFoundryDiscoveryMvcEndpoint}.
+ *
+ * @author Madhura Bhave
+ */
+public class CloudFoundryDiscoveryMvcEndpointTests {
+
+	private CloudFoundryDiscoveryMvcEndpoint endpoint;
+
+	@Before
+	public void setup() {
+		NamedMvcEndpoint testMvcEndpoint = new TestMvcEndpoint(new TestEndpoint("a"));
+		Set<NamedMvcEndpoint> endpoints = new LinkedHashSet<NamedMvcEndpoint>();
+		endpoints.add(testMvcEndpoint);
+		this.endpoint = new CloudFoundryDiscoveryMvcEndpoint(endpoints);
+	}
+
+	@Test
+	public void cloudfoundryHalJsonEndpointHasEmptyPath() throws Exception {
+		assertThat(this.endpoint.getPath()).isEmpty();
+	}
+
+	@Test
+	public void linksResponseWhenRequestUriHasNoTrailingSlash() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/cloudfoundryapplication");
+		Map<String, CloudFoundryDiscoveryMvcEndpoint.Link> links = this.endpoint
+				.links(request).get("_links");
+		assertThat(links.get("self").getHref())
+				.isEqualTo("http://localhost/cloudfoundryapplication");
+		assertThat(links.get("a").getHref())
+				.isEqualTo("http://localhost/cloudfoundryapplication/a");
+	}
+
+	@Test
+	public void linksResponseWhenRequestUriHasTrailingSlash() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/cloudfoundryapplication/");
+		Map<String, CloudFoundryDiscoveryMvcEndpoint.Link> links = this.endpoint
+				.links(request).get("_links");
+		assertThat(links.get("self").getHref())
+				.isEqualTo("http://localhost/cloudfoundryapplication");
+		assertThat(links.get("a").getHref())
+				.isEqualTo("http://localhost/cloudfoundryapplication/a");
+	}
+
+	private static class TestEndpoint extends AbstractEndpoint<Object> {
+
+		TestEndpoint(String id) {
+			super(id);
+		}
+
+		@Override
+		public Object invoke() {
+			return null;
+		}
+
+	}
+
+	private static class TestMvcEndpoint extends EndpointMvcAdapter {
+
+		TestMvcEndpoint(TestEndpoint delegate) {
+			super(delegate);
+		}
+
+	}
+
+}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryEndpointHandlerMappingTests.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright 2012-2016 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.cloudfoundry;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
+import org.springframework.boot.actuate.endpoint.mvc.EndpointMvcAdapter;
+import org.springframework.boot.actuate.endpoint.mvc.HalJsonMvcEndpoint;
+import org.springframework.boot.actuate.endpoint.mvc.ManagementServletContext;
+import org.springframework.boot.actuate.endpoint.mvc.NamedMvcEndpoint;
+import org.springframework.context.support.StaticApplicationContext;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerExecutionChain;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link CloudFoundryEndpointHandlerMapping}.
+ *
+ * @author Madhura Bhave
+ */
+public class CloudFoundryEndpointHandlerMappingTests {
+
+	@Test
+	public void getHandlerExecutionChainShouldHaveSecurityInterceptor() throws Exception {
+		TestMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));
+		CloudFoundryEndpointHandlerMapping handlerMapping = new CloudFoundryEndpointHandlerMapping(
+				Arrays.asList(endpoint));
+		HandlerExecutionChain handlerExecutionChain = handlerMapping
+				.getHandlerExecutionChain(endpoint, new MockHttpServletRequest());
+		HandlerInterceptor[] interceptors = handlerExecutionChain.getInterceptors();
+		assertThat(interceptors).hasAtLeastOneElementOfType(
+				CloudFoundryEndpointHandlerMapping.SecurityInterceptor.class);
+	}
+
+	@Test
+	public void getHandlerExecutionChainWhenEndpointHasPathShouldMapAgainstName()
+			throws Exception {
+		TestMvcEndpoint testMvcEndpoint = new TestMvcEndpoint(new TestEndpoint("a"));
+		testMvcEndpoint.setPath("something-else");
+		CloudFoundryEndpointHandlerMapping handlerMapping = new CloudFoundryEndpointHandlerMapping(
+				Arrays.asList(testMvcEndpoint));
+		assertThat(handlerMapping.getPath(testMvcEndpoint)).isEqualTo("/a");
+	}
+
+	@Test
+	public void doesNotRegisterHalJsonMvcEndpoint() throws Exception {
+		CloudFoundryEndpointHandlerMapping handlerMapping = new CloudFoundryEndpointHandlerMapping(
+				Collections.<NamedMvcEndpoint>singleton(new TestHalJsonMvcEndpoint()));
+		assertThat(handlerMapping.getEndpoints()).hasSize(0);
+	}
+
+	@Test
+	public void registersCloudFoundryDiscoveryEndpoint() throws Exception {
+		StaticApplicationContext context = new StaticApplicationContext();
+		CloudFoundryEndpointHandlerMapping handlerMapping = new CloudFoundryEndpointHandlerMapping(
+				Collections.<NamedMvcEndpoint>emptyList());
+		handlerMapping.setPrefix("/test");
+		handlerMapping.setApplicationContext(context);
+		handlerMapping.afterPropertiesSet();
+		HandlerExecutionChain handler = handlerMapping
+				.getHandler(new MockHttpServletRequest("GET", "/test"));
+		HandlerMethod handlerMethod = (HandlerMethod) handler.getHandler();
+		assertThat(handlerMethod.getBean())
+				.isInstanceOf(CloudFoundryDiscoveryMvcEndpoint.class);
+	}
+
+	private static class TestEndpoint extends AbstractEndpoint<Object> {
+
+		TestEndpoint(String id) {
+			super(id);
+		}
+
+		@Override
+		public Object invoke() {
+			return null;
+		}
+
+	}
+
+	private static class TestMvcEndpoint extends EndpointMvcAdapter {
+
+		TestMvcEndpoint(TestEndpoint delegate) {
+			super(delegate);
+		}
+
+	}
+
+	private static class TestHalJsonMvcEndpoint extends HalJsonMvcEndpoint {
+
+		TestHalJsonMvcEndpoint() {
+			super(new ManagementServletContext() {
+
+				@Override
+				public String getContextPath() {
+					return "";
+				}
+
+			});
+
+		}
+	}
+
+}

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

@@ -137,15 +137,6 @@ public class EndpointHandlerMappingTests {
 		assertThat(mapping.getHandler(request("POST", "/a"))).isNull();
 	}
 
-	@Test
-	public void getEndpointsForSpecifiedType() throws Exception {
-		TestMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));
-		TestActionEndpoint other = new TestActionEndpoint(new TestEndpoint("b"));
-		EndpointHandlerMapping mapping = new EndpointHandlerMapping(
-				Arrays.asList(endpoint, other));
-		assertThat(mapping.getEndpoints(TestMvcEndpoint.class)).containsExactly(endpoint);
-	}
-
 	@Test
 	public void pathNotMappedWhenGetPathReturnsNull() throws Exception {
 		TestMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));

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

@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.endpoint.mvc;
 import org.junit.Test;
 
 import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
+import org.springframework.boot.actuate.endpoint.Endpoint;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.support.StaticApplicationContext;
@@ -78,10 +79,21 @@ public class MvcEndpointsTests {
 				.isEqualTo("/foo/bar");
 	}
 
+	@Test
+	public void getEndpointsForSpecifiedType() throws Exception {
+		this.context.getDefaultListableBeanFactory().registerSingleton("endpoint-1",
+				new TestMvcEndpoint(new TestEndpoint()));
+		this.context.getDefaultListableBeanFactory().registerSingleton("endpoint-2",
+				new OtherTestMvcEndpoint(new TestEndpoint()));
+		this.endpoints.setApplicationContext(this.context);
+		this.endpoints.afterPropertiesSet();
+		assertThat(this.endpoints.getEndpoints(TestMvcEndpoint.class)).hasSize(1);
+	}
+
 	@ConfigurationProperties("endpoints.test")
 	protected static class TestEndpoint extends AbstractEndpoint<String> {
 
-		public TestEndpoint() {
+		TestEndpoint() {
 			super("test");
 		}
 
@@ -91,4 +103,18 @@ public class MvcEndpointsTests {
 		}
 	}
 
+	private static class TestMvcEndpoint extends EndpointMvcAdapter {
+
+		TestMvcEndpoint(Endpoint<?> delegate) {
+			super(delegate);
+		}
+	}
+
+	private static class OtherTestMvcEndpoint extends EndpointMvcAdapter {
+
+		OtherTestMvcEndpoint(Endpoint<?> delegate) {
+			super(delegate);
+		}
+	}
+
 }