Replace Pipe with Fence in the Maven plugin.

Author: nedtwigg

plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java

@@ -36,7 +36,6 @@
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.generic.PipeStepPair;
 import com.diffplug.spotless.maven.generic.EclipseWtp;
 import com.diffplug.spotless.maven.generic.EndWithNewline;
 import com.diffplug.spotless.maven.generic.Indent;
@@ -97,9 +96,8 @@ public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, Form
 				.map(factory -> factory.newFormatterStep(stepConfig))
 				.collect(Collectors.toCollection(() -> new ArrayList<FormatterStep>()));
 		if (toggle != null) {
-			PipeStepPair pair = toggle.createPair();
-			formatterSteps.add(0, pair.in());
-			formatterSteps.add(pair.out());
+			List<FormatterStep> formatterStepsBeforeToggle = formatterSteps;
+			formatterSteps = List.of(toggle.createFence().preserveWithin(formatterStepsBeforeToggle));
 		}
 
 		String formatterName = this.getClass().getSimpleName();

plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/ToggleOffOn.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 DiffPlug
+ * Copyright 2020-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,23 +17,23 @@
 
 import org.apache.maven.plugins.annotations.Parameter;
 
-import com.diffplug.spotless.generic.PipeStepPair;
+import com.diffplug.spotless.generic.FenceStep;
 
 public class ToggleOffOn {
 	@Parameter
-	public String off = PipeStepPair.defaultToggleOff();
+	public String off = FenceStep.defaultToggleOff();
 
 	@Parameter
-	public String on = PipeStepPair.defaultToggleOn();
+	public String on = FenceStep.defaultToggleOn();
 
 	@Parameter
 	public String regex;
 
-	public PipeStepPair createPair() {
+	public FenceStep createFence() {
 		if (regex != null) {
-			return PipeStepPair.named(PipeStepPair.defaultToggleName()).regex(regex).buildPair();
+			return FenceStep.named(FenceStep.defaultToggleName()).regex(regex);
 		} else {
-			return PipeStepPair.named(PipeStepPair.defaultToggleName()).openClose(off, on).buildPair();
+			return FenceStep.named(FenceStep.defaultToggleName()).openClose(off, on);
 		}
 	}
 }