Builder annotation also including unwanted items, so DIY

ultraq · ultraq · commit cd3d887a7fc4 · 2025-01-27T22:20:14.000+13:00
diff --git a/thymeleaf-layout-dialect/source/nz/net/ultraq/thymeleaf/layoutdialect/LayoutDialect.groovy b/thymeleaf-layout-dialect/source/nz/net/ultraq/thymeleaf/layoutdialect/LayoutDialect.groovy
@@ -32,9 +32,6 @@ import org.thymeleaf.processor.IProcessor
 import org.thymeleaf.standard.processor.StandardXmlNsTagProcessor
 import org.thymeleaf.templatemode.TemplateMode
 
-import groovy.transform.builder.Builder
-import groovy.transform.builder.SimpleStrategy
-
 /**
  * A dialect for Thymeleaf that lets you build layouts and reusable templates in
  * order to improve code reuse.
@@ -51,32 +48,30 @@ import groovy.transform.builder.SimpleStrategy
  *
  * @author Emanuel Rabina
  */
-@Builder(
-	builderStrategy = SimpleStrategy,
-	includes = ['sortingStrategy', 'autoHeadMerging', 'experimentalTitleTokens'],
-	prefix = 'with'
-)
 class LayoutDialect extends AbstractProcessorDialect {
 
 	static final String DIALECT_NAME = 'Layout'
 	static final String DIALECT_PREFIX = 'layout'
 	static final int DIALECT_PRECEDENCE = 10
 
-	SortingStrategy sortingStrategy = new AppendingStrategy()
+	@SuppressWarnings('PrivateFieldCouldBeFinal')
+	private SortingStrategy sortingStrategy = new AppendingStrategy()
 
 	/**
 	 * Experimental option, set to {@code false} to skip the automatic merging
 	 * of an HTML {@code <head>} section.
 	 */
-	boolean autoHeadMerging = true
+	@SuppressWarnings('PrivateFieldCouldBeFinal')
+	private boolean autoHeadMerging = true
 
 	/**
 	 * Experimental option, set to {@code true} to use standard Thymeleaf
 	 * expression syntax for title patterns and to have access to the title parts
 	 * in templates as the variables {@code layoutDialectContentTitle} and
 	 * {@code layoutDialectLayoutTitle}.
 	 */
-	boolean experimentalTitleTokens = false
+	@SuppressWarnings('PrivateFieldCouldBeFinal')
+	private boolean experimentalTitleTokens = false
 
 	/**
 	 * Constructor, configure the layout dialect.
@@ -125,4 +120,33 @@ class LayoutDialect extends AbstractProcessorDialect {
 			new CollectFragmentProcessor(TemplateMode.XML, dialectPrefix)
 		]
 	}
+
+	/**
+	 * Configure this instance of the layout dialect with the given {@code autoHeadMerging}
+	 * value.
+	 */
+	LayoutDialect withAutoHeadMerging(boolean autoHeadMerging) {
+
+		this.autoHeadMerging = autoHeadMerging
+		return this
+	}
+
+	/**
+	 * Configure this instance of the layout dialect with the given {@code experimentalTitleTokens}
+	 * value.
+	 */
+	LayoutDialect withExperimentalTitleTokens(boolean experimentalTitleTokens) {
+
+		this.experimentalTitleTokens = experimentalTitleTokens
+		return this
+	}
+
+	/**
+	 * Configure this instance of the layout dialect with the given {@code sortingStrategy}.
+	 */
+	LayoutDialect withSortingStrategy(SortingStrategy sortingStrategy) {
+
+		this.sortingStrategy = sortingStrategy
+		return this
+	}
 }
