Stop using PipeStepPair internally.

Author: nedtwigg

testlib/src/test/java/com/diffplug/spotless/combined/CombinedJavaFormatStepTest.java

@@ -17,14 +17,16 @@
 
 import static com.diffplug.spotless.TestProvisioner.mavenCentral;
 
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
+import com.diffplug.spotless.generic.FenceStep;
 import com.diffplug.spotless.generic.IndentStep;
-import com.diffplug.spotless.generic.PipeStepPair;
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.java.GoogleJavaFormatStep;
 import com.diffplug.spotless.java.ImportOrderStep;
@@ -40,16 +42,15 @@ void checkIssue1679() {
 		FormatterStep removeUnused = RemoveUnusedImportsStep.create(mavenCentral());
 		FormatterStep trimTrailing = TrimTrailingWhitespaceStep.create();
 		FormatterStep endWithNewLine = EndWithNewlineStep.create();
-		PipeStepPair toggleOffOnPair = PipeStepPair.named(PipeStepPair.defaultToggleName()).openClose("formatting:off", "formatting:on").buildPair();
+		FenceStep toggleOffOnPair = FenceStep.named(FenceStep.defaultToggleName()).openClose("formatting:off", "formatting:on");
 		try (StepHarness formatter = StepHarness.forSteps(
-				toggleOffOnPair.in(),
-				gjf,
-				indentWithSpaces,
-				importOrder,
-				removeUnused,
-				trimTrailing,
-				endWithNewLine,
-				toggleOffOnPair.out())) {
+				toggleOffOnPair.preserveWithin(List.of(
+						gjf,
+						indentWithSpaces,
+						importOrder,
+						removeUnused,
+						trimTrailing,
+						endWithNewLine)))) {
 			formatter.testResource("combined/issue1679.dirty", "combined/issue1679.clean");
 		}
 	}