remove obsoletes found in SortPomCfg and PomExtension

Author: Vincent Potucek

lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java

@@ -48,6 +48,8 @@
 import dev.equo.solstice.Solstice;
 import dev.equo.solstice.p2.CacheLocations;
 
+import static java.lang.System.lineSeparator;
+
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
 	static {
@@ -143,7 +145,7 @@ public String toString() {
 			}
 			for (Throwable error : errors) {
 				error.printStackTrace();
-				string.append(System.lineSeparator());
+				string.append(lineSeparator());
 				string.append(error.getMessage());
 			}
 

lib/src/main/java/com/diffplug/spotless/Jvm.java

@@ -31,6 +31,9 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+import static java.lang.System.lineSeparator;
+import static java.util.stream.Collectors.joining;
+
 /** Java virtual machine helper */
 public final class Jvm {
 	private static final int VERSION;
@@ -255,7 +258,7 @@ private String buildUpgradeFormatterMessage(V fmtVersion) {
 		public String toString() {
 			return String.format("%s alternatives:%n", fmtName) +
 					jvm2fmtMaxVersion.entrySet().stream().map(
-							e -> String.format("- Version %s requires JVM %d+", e.getValue(), e.getKey())).collect(Collectors.joining(System.lineSeparator()));
+							e -> String.format("- Version %s requires JVM %d+", e.getValue(), e.getKey())).collect(joining(lineSeparator()));
 		}
 
 		@SuppressFBWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")

lib/src/main/java/com/diffplug/spotless/LineEnding.java

@@ -25,6 +25,8 @@
 import java.util.Objects;
 import java.util.function.Supplier;
 
+import static java.lang.System.lineSeparator;
+
 /**
  * Represents the line endings which should be written by the tool.
  */
@@ -151,7 +153,7 @@ static String getEndingFor(Reader reader) throws IOException {
 	private static final Policy UNIX_POLICY = new ConstantLineEndingPolicy(UNIX.str());
     private static final Policy MAC_CLASSIC_POLICY = new ConstantLineEndingPolicy(MAC_CLASSIC.str());
     private static final Policy PRESERVE_POLICY = new PreserveLineEndingPolicy();
-	private static final String _platformNative = System.getProperty("line.separator");
+	private static final String _platformNative = lineSeparator();
 	private static final Policy _platformNativePolicy = new ConstantLineEndingPolicy(_platformNative);
 	private static final boolean nativeIsWin = _platformNative.equals(WINDOWS.str());
 

lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java

@@ -22,6 +22,8 @@
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 
+import static java.lang.System.lineSeparator;
+
 /**
  * Removes all semicolons from the end of lines.
  *
@@ -51,7 +53,7 @@ FormatterFunc toFormatter() {
 					String line;
 					while ((line = reader.readLine()) != null) {
 						result.append(removeSemicolon(line));
-						result.append(System.lineSeparator());
+						result.append(lineSeparator());
 					}
 					return result.toString();
 				}

lib/src/main/java/com/diffplug/spotless/pom/SortPomCfg.java

@@ -17,6 +17,8 @@
 
 import java.io.Serializable;
 
+import static java.lang.System.lineSeparator;
+
 // Class and members must be public, otherwise we get failed to access class com.diffplug.spotless.pom.SortPomInternalState from class com.diffplug.spotless.pom.SortPomFormatterFunc (com.diffplug.spotless.pom.SortPomInternalState is in unnamed module of loader org.codehaus.plexus.classworlds.realm.ClassRealm @682bd3c4; com.diffplug.spotless.pom.SortPomFormatterFunc is in unnamed module of loader com.diffplug.spotless.pom.DelegatingClassLoader @573284a5)
 public class SortPomCfg implements Serializable {
 	private static final long serialVersionUID = 1L;
@@ -25,7 +27,7 @@ public class SortPomCfg implements Serializable {
 
 	public String encoding = "UTF-8";
 
-	public String lineSeparator = System.getProperty("line.separator");
+	public String lineSeparator = lineSeparator();
 
 	public boolean expandEmptyElements;
 

lib/src/test/java/com/diffplug/spotless/pom/SortPomCfgTest.java

@@ -15,6 +15,7 @@
  */
 package com.diffplug.spotless.pom;
 
+import static java.lang.System.lineSeparator;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
@@ -28,7 +29,7 @@ void testDefaultValues() {
 		// Test default values using AssertJ
 		assertThat(cfg.version).isEqualTo("4.0.0");
 		assertThat(cfg.encoding).isEqualTo("UTF-8");
-		assertThat(cfg.lineSeparator).isEqualTo(System.getProperty("line.separator"));
+		assertThat(cfg.lineSeparator).isEqualTo(lineSeparator());
 		assertThat(cfg.expandEmptyElements).isFalse();
 		assertThat(cfg.spaceBeforeCloseEmptyElement).isFalse();
 		assertThat(cfg.keepBlankLines).isTrue();