Polish

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

@@ -524,12 +524,11 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 		assertThat(metadata.getItems()).hasSize(3);
 	}
 
-
 	@Test
 	public void simpleEndpoint() throws IOException {
 		ConfigurationMetadata metadata = compile(SimpleEndpoint.class);
-		assertThat(metadata).has(Metadata.withGroup("endpoints.simple")
-				.fromSource(SimpleEndpoint.class));
+		assertThat(metadata).has(
+				Metadata.withGroup("endpoints.simple").fromSource(SimpleEndpoint.class));
 		assertThat(metadata).has(enabledFlag("simple", true));
 		assertThat(metadata).has(jmxEnabledFlag("simple", true));
 		assertThat(metadata).has(webEnabledFlag("simple", false));
@@ -554,8 +553,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 		ConfigurationMetadata metadata = compile(CustomPropertiesEndpoint.class);
 		assertThat(metadata).has(Metadata.withGroup("endpoints.customprops")
 				.fromSource(CustomPropertiesEndpoint.class));
-		assertThat(metadata).has(Metadata.withProperty("endpoints.customprops.name").
-				ofType(String.class).withDefaultValue("test"));
+		assertThat(metadata).has(Metadata.withProperty("endpoints.customprops.name")
+				.ofType(String.class).withDefaultValue("test"));
 		assertThat(metadata).has(enabledFlag("customprops", true));
 		assertThat(metadata).has(jmxEnabledFlag("customprops", true));
 		assertThat(metadata).has(webEnabledFlag("customprops", false));
@@ -566,8 +565,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 	@Test
 	public void jmxOnlyEndpoint() throws IOException {
 		ConfigurationMetadata metadata = compile(OnlyJmxEndpoint.class);
-		assertThat(metadata).has(Metadata.withGroup("endpoints.jmx")
-				.fromSource(OnlyJmxEndpoint.class));
+		assertThat(metadata).has(
+				Metadata.withGroup("endpoints.jmx").fromSource(OnlyJmxEndpoint.class));
 		assertThat(metadata).has(enabledFlag("jmx", true));
 		assertThat(metadata).has(jmxEnabledFlag("jmx", true));
 		assertThat(metadata).has(cacheTtl("jmx"));
@@ -577,8 +576,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 	@Test
 	public void webOnlyEndpoint() throws IOException {
 		ConfigurationMetadata metadata = compile(OnlyWebEndpoint.class);
-		assertThat(metadata).has(Metadata.withGroup("endpoints.web")
-				.fromSource(OnlyWebEndpoint.class));
+		assertThat(metadata).has(
+				Metadata.withGroup("endpoints.web").fromSource(OnlyWebEndpoint.class));
 		assertThat(metadata).has(enabledFlag("web", true));
 		assertThat(metadata).has(webEnabledFlag("web", false));
 		assertThat(metadata).has(cacheTtl("web"));
@@ -622,7 +621,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 		assertThat(metadata).has(cacheTtl("incremental"));
 		assertThat(metadata.getItems()).hasSize(5);
 		project.replaceText(IncrementalEndpoint.class, "id = \"incremental\"",
-				"id = \"incremental\", types = Endpoint.Type.WEB");
+				"id = \"incremental\", exposure = org.springframework.boot."
+						+ "configurationsample.EndpointExposure.WEB");
 		metadata = project.incrementalBuild(IncrementalEndpoint.class);
 		assertThat(metadata).has(Metadata.withGroup("endpoints.incremental")
 				.fromSource(IncrementalEndpoint.class));
@@ -643,8 +643,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 		assertThat(metadata).has(jmxEnabledFlag("incremental", true));
 		assertThat(metadata).has(cacheTtl("incremental"));
 		assertThat(metadata.getItems()).hasSize(4);
-		project.replaceText(IncrementalJmxEndpoint.class, ", types = Endpoint.Type.JMX",
-				"");
+		project.replaceText(IncrementalJmxEndpoint.class,
+				", exposure = EndpointExposure.JMX", "");
 		metadata = project.incrementalBuild(IncrementalJmxEndpoint.class);
 		assertThat(metadata).has(Metadata.withGroup("endpoints.incremental")
 				.fromSource(IncrementalJmxEndpoint.class));
@@ -658,22 +658,22 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 	private Metadata.MetadataItemCondition enabledFlag(String endpointId,
 			boolean defaultValue) {
 		return Metadata.withEnabledFlag("endpoints." + endpointId + ".enabled")
-				.withDefaultValue(defaultValue).withDescription(
-						String.format("Enable the %s endpoint.", endpointId));
+				.withDefaultValue(defaultValue)
+				.withDescription(String.format("Enable the %s endpoint.", endpointId));
 	}
 
 	private Metadata.MetadataItemCondition jmxEnabledFlag(String endpointId,
 			boolean defaultValue) {
 		return Metadata.withEnabledFlag("endpoints." + endpointId + ".jmx.enabled")
-				.withDefaultValue(defaultValue).withDescription(String.format(
-						"Expose the %s endpoint as a JMX MBean.", endpointId));
+				.withDefaultValue(defaultValue).withDescription(String
+						.format("Expose the %s endpoint as a JMX MBean.", endpointId));
 	}
 
 	private Metadata.MetadataItemCondition webEnabledFlag(String endpointId,
 			boolean defaultValue) {
 		return Metadata.withEnabledFlag("endpoints." + endpointId + ".web.enabled")
-				.withDefaultValue(defaultValue).withDescription(String.format(
-						"Expose the %s endpoint as a Web endpoint.", endpointId));
+				.withDefaultValue(defaultValue).withDescription(String
+						.format("Expose the %s endpoint as a Web endpoint.", endpointId));
 	}
 
 	private Metadata.MetadataItemCondition cacheTtl(String endpointId) {

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/Endpoint.java

@@ -37,14 +37,6 @@ public @interface Endpoint {
 
 	boolean enabledByDefault() default true;
 
-	Type[] types() default {};
-
-	enum Type {
-
-		JMX,
-
-		WEB
-
-	}
+	EndpointExposure[] exposure() default {};
 
 }

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/EndpointExposure.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2012-2017 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.configurationsample;
+
+public enum EndpointExposure {
+
+	JMX,
+
+	WEB
+
+}

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/OnlyJmxEndpoint.java

@@ -17,13 +17,14 @@
 package org.springframework.boot.configurationsample.endpoint;
 
 import org.springframework.boot.configurationsample.Endpoint;
+import org.springframework.boot.configurationsample.EndpointExposure;
 
 /**
  * An endpoint that only exposes a JMX MBean.
  *
  * @author Stephane Nicoll
  */
-@Endpoint(id = "jmx", types = Endpoint.Type.JMX)
+@Endpoint(id = "jmx", exposure = EndpointExposure.JMX)
 public class OnlyJmxEndpoint {
 
 }

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/OnlyWebEndpoint.java

@@ -17,13 +17,14 @@
 package org.springframework.boot.configurationsample.endpoint;
 
 import org.springframework.boot.configurationsample.Endpoint;
+import org.springframework.boot.configurationsample.EndpointExposure;
 
 /**
  * An endpoints that only exposes a web endpoint.
  *
  * @author Stephane Nicoll
  */
-@Endpoint(id = "web", types = Endpoint.Type.WEB)
+@Endpoint(id = "web", exposure = EndpointExposure.WEB)
 public class OnlyWebEndpoint {
 
 }

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/endpoint/incremental/IncrementalJmxEndpoint.java

@@ -17,13 +17,14 @@
 package org.springframework.boot.configurationsample.endpoint.incremental;
 
 import org.springframework.boot.configurationsample.Endpoint;
+import org.springframework.boot.configurationsample.EndpointExposure;
 
 /**
  * An endpoint that only exposes a JMX MBean.
  *
  * @author Stephane Nicoll
  */
-@Endpoint(id = "incremental", types = Endpoint.Type.JMX)
+@Endpoint(id = "incremental", exposure = EndpointExposure.JMX)
 public class IncrementalJmxEndpoint {
 
 }