Use new backend features for extracted samples

Update extracted samples to make use of code folding and chomping.

See gh-6313

Author: philwebb

spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc

@@ -7,9 +7,9 @@
 :numbered:
 :sectanchors:
 :sectnums:
-:icons: font
 :hide-uri-scheme:
 :docinfo: shared,private
+:chomp: tags formatters headers packages
 
 :spring-boot-artifactory-repo: snapshot
 :github-tag: master

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration;
 
-//tag::code[]
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -31,7 +30,7 @@ public AnotherComponent anotherComponent() {
 	}
 
 }
-// end::code[]
+// @chomp:file
 
 class AnotherComponent {
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/ThirdPartyConfiguration.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.constructorbinding;
 
-//tag::code[]
 import java.net.InetAddress;
 import java.util.List;
 
@@ -28,18 +27,22 @@
 @ConfigurationProperties("acme")
 public class AcmeProperties {
 
+	// @fold:on // fields...
 	private final boolean enabled;
 
 	private final InetAddress remoteAddress;
 
 	private final Security security;
 
+	// @fold:off
+
 	public AcmeProperties(boolean enabled, InetAddress remoteAddress, Security security) {
 		this.enabled = enabled;
 		this.remoteAddress = remoteAddress;
 		this.security = security;
 	}
 
+	// @fold:on // getters...
 	public boolean isEnabled() {
 		return this.enabled;
 	}
@@ -51,21 +54,26 @@ public InetAddress getRemoteAddress() {
 	public Security getSecurity() {
 		return this.security;
 	}
+	// @fold:off
 
 	public static class Security {
 
+		// @fold:on // fields...
 		private final String username;
 
 		private final String password;
 
 		private final List<String> roles;
 
+		// @fold:off
+
 		public Security(String username, String password, @DefaultValue("USER") List<String> roles) {
 			this.username = username;
 			this.password = password;
 			this.roles = roles;
 		}
 
+		// @fold:on // getters...
 		public String getUsername() {
 			return this.username;
 		}
@@ -77,8 +85,8 @@ public String getPassword() {
 		public List<String> getRoles() {
 			return this.roles;
 		}
+		// @fold:off
 
 	}
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/constructorbinding/AcmeProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.datasize.constructorbinding;
 
-// tag::code[]
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.ConstructorBinding;
 import org.springframework.boot.context.properties.bind.DefaultValue;
@@ -28,23 +27,26 @@
 @ConstructorBinding
 public class AppIoProperties {
 
+	// @fold:on // fields...
 	private final DataSize bufferSize;
 
 	private final DataSize sizeThreshold;
 
+	// @fold:off
 	public AppIoProperties(@DataSizeUnit(DataUnit.MEGABYTES) @DefaultValue("2MB") DataSize bufferSize,
 			@DefaultValue("512B") DataSize sizeThreshold) {
 		this.bufferSize = bufferSize;
 		this.sizeThreshold = sizeThreshold;
 	}
 
+	// @fold:on // getters...
 	public DataSize getBufferSize() {
 		return this.bufferSize;
 	}
 
 	public DataSize getSizeThreshold() {
 		return this.sizeThreshold;
 	}
+	// @fold:off
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/constructorbinding/AppIoProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.datasize.javabeanbinding;
 
-// tag::code[]
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.convert.DataSizeUnit;
 import org.springframework.util.unit.DataSize;
@@ -30,6 +29,7 @@ public class AppIoProperties {
 
 	private DataSize sizeThreshold = DataSize.ofBytes(512);
 
+	// @fold:on // getters/setters...
 	public DataSize getBufferSize() {
 		return this.bufferSize;
 	}
@@ -45,6 +45,6 @@ public DataSize getSizeThreshold() {
 	public void setSizeThreshold(DataSize sizeThreshold) {
 		this.sizeThreshold = sizeThreshold;
 	}
+	// @fold:off
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/datasize/javabeanbinding/AppIoProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.duration.constructorbinding;
 
-// tag::code[]
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 
@@ -29,23 +28,26 @@
 @ConstructorBinding
 public class AppSystemProperties {
 
+	// @fold:on // fields...
 	private final Duration sessionTimeout;
 
 	private final Duration readTimeout;
 
+	// @fold:off
 	public AppSystemProperties(@DurationUnit(ChronoUnit.SECONDS) @DefaultValue("30s") Duration sessionTimeout,
 			@DefaultValue("1000ms") Duration readTimeout) {
 		this.sessionTimeout = sessionTimeout;
 		this.readTimeout = readTimeout;
 	}
 
+	// @fold:on // getters...
 	public Duration getSessionTimeout() {
 		return this.sessionTimeout;
 	}
 
 	public Duration getReadTimeout() {
 		return this.readTimeout;
 	}
+	// @fold:off
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/constructorbinding/AppSystemProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.duration.javabeanbinding;
 
-// tag::code[]
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 
@@ -31,6 +30,7 @@ public class AppSystemProperties {
 
 	private Duration readTimeout = Duration.ofMillis(1000);
 
+	// @fold:on // getters / setters...
 	public Duration getSessionTimeout() {
 		return this.sessionTimeout;
 	}
@@ -46,6 +46,6 @@ public Duration getReadTimeout() {
 	public void setReadTimeout(Duration readTimeout) {
 		this.readTimeout = readTimeout;
 	}
+	// @fold:off
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/duration/javabeanbinding/AppSystemProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.enable;
 
-//tag::code[]
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 
@@ -25,4 +24,3 @@
 public class MyApplication {
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyApplication.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.enable;
 
-//tag::code[]
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -25,7 +24,7 @@
 public class MyConfiguration {
 
 }
-// end::code[]
+// @chomp:file
 
 class AcmeProperties {
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/enable/MyConfiguration.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.javabeanbinding;
 
-//tag::code[]
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,6 +32,7 @@ public class AcmeProperties {
 
 	private final Security security = new Security();
 
+	// @fold:on // getters / setters...
 	public boolean isEnabled() {
 		return this.enabled;
 	}
@@ -52,6 +52,7 @@ public void setRemoteAddress(InetAddress remoteAddress) {
 	public Security getSecurity() {
 		return this.security;
 	}
+	// @fold:off
 
 	public static class Security {
 
@@ -61,6 +62,7 @@ public static class Security {
 
 		private List<String> roles = new ArrayList<>(Collections.singleton("USER"));
 
+		// @fold:on // getters / setters...
 		public String getUsername() {
 			return this.username;
 		}
@@ -84,8 +86,8 @@ public List<String> getRoles() {
 		public void setRoles(List<String> roles) {
 			this.roles = roles;
 		}
+		// @fold:off
 
 	}
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/javabeanbinding/AcmeProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.merge.list;
 
-//tag::code[]
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,7 +31,7 @@ public List<MyPojo> getList() {
 	}
 
 }
-// end::code[]
+// @chomp: file
 
 class MyPojo {
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/list/AcmeProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.merge.map;
 
-//tag::code[]
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -32,7 +31,7 @@ public Map<String, MyPojo> getMap() {
 	}
 
 }
-// end::code[]
+// @chomp:file
 
 class MyPojo {
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/merge/map/AcmeProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.relaxed;
 
-//tag::code[]
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "acme.my-project.person")
@@ -33,4 +32,3 @@ public void setFirstName(String firstName) {
 	}
 
 }
-// end::code[]

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/relaxed/OwnerProperties.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.use;
 
-//tag::code[]
 import org.springframework.stereotype.Service;
 
 @Service
@@ -37,7 +36,7 @@ public void openConnection() {
 	// ...
 
 }
-// end::code[]
+// @chomp:file
 
 class AcmeProperties {
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/springbootfeatures/externalizedconfiguration/use/MyService.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.docs.springbootfeatures.externalizedconfiguration.validate;
 
-//tag::code[]
 import java.net.InetAddress;
 
 import javax.validation.constraints.NotNull;
@@ -31,13 +30,14 @@ public class AcmeProperties {
 	@NotNull
 	private InetAddress remoteAddress;
 
+	// @fold:on // getters/setters...
 	public InetAddress getRemoteAddress() {
 		return this.remoteAddress;
 	}
 
 	public void setRemoteAddress(InetAddress remoteAddress) {
 		this.remoteAddress = remoteAddress;
 	}
+	// @fold:off
 
 }
-// end::code[]