Skip to content

Commit 41a611e

Browse files
author
Vincent Potucek
committed
Call 'getProperty' can be simplified for 'line.separator'
1 parent 0ce3f1f commit 41a611e

File tree

9 files changed

+135
-346
lines changed

9 files changed

+135
-346
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
import dev.equo.solstice.Solstice;
4949
import dev.equo.solstice.p2.CacheLocations;
5050

51+
import static java.lang.System.lineSeparator;
52+
5153
/** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
5254
public class GrEclipseFormatterStepImpl {
5355
static {
@@ -143,7 +145,7 @@ public String toString() {
143145
}
144146
for (Throwable error : errors) {
145147
error.printStackTrace();
146-
string.append(System.lineSeparator());
148+
string.append(lineSeparator());
147149
string.append(error.getMessage());
148150
}
149151

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3333

34+
import static java.lang.System.lineSeparator;
35+
3436
/** Java virtual machine helper */
3537
public final class Jvm {
3638
private static final int VERSION;
@@ -255,7 +257,7 @@ private String buildUpgradeFormatterMessage(V fmtVersion) {
255257
public String toString() {
256258
return String.format("%s alternatives:%n", fmtName) +
257259
jvm2fmtMaxVersion.entrySet().stream().map(
258-
e -> String.format("- Version %s requires JVM %d+", e.getValue(), e.getKey())).collect(Collectors.joining(System.lineSeparator()));
260+
e -> String.format("- Version %s requires JVM %d+", e.getValue(), e.getKey())).collect(Collectors.joining(lineSeparator()));
259261
}
260262

261263
@SuppressFBWarnings("SE_COMPARATOR_SHOULD_BE_SERIALIZABLE")

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import java.util.Objects;
2626
import java.util.function.Supplier;
2727

28+
import static java.lang.System.lineSeparator;
29+
2830
/**
2931
* Represents the line endings which should be written by the tool.
3032
*/
@@ -151,7 +153,7 @@ static String getEndingFor(Reader reader) throws IOException {
151153
private static final Policy UNIX_POLICY = new ConstantLineEndingPolicy(UNIX.str());
152154
private static final Policy MAC_CLASSIC_POLICY = new ConstantLineEndingPolicy(MAC_CLASSIC.str());
153155
private static final Policy PRESERVE_POLICY = new PreserveLineEndingPolicy();
154-
private static final String _platformNative = System.getProperty("line.separator");
156+
private static final String _platformNative = lineSeparator();
155157
private static final Policy _platformNativePolicy = new ConstantLineEndingPolicy(_platformNative);
156158
private static final boolean nativeIsWin = _platformNative.equals(WINDOWS.str());
157159

lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,14 @@ String format(String raw) {
102102
if (numSpaces > 0) {
103103
switch (state.type) {
104104
case SPACE:
105-
builder.append(" ".repeat(numSpaces));
105+
for (int i = 0; i < numSpaces; ++i) {
106+
builder.append(' ');
107+
}
106108
break;
107109
case TAB:
108-
builder.append("\t".repeat(Math.max(0, numSpaces / state.numSpacesPerTab)));
110+
for (int i = 0; i < numSpaces / state.numSpacesPerTab; ++i) {
111+
builder.append('\t');
112+
}
109113
if (mightBeMultiLineComment && (numSpaces % state.numSpacesPerTab == 1)) {
110114
builder.append(' ');
111115
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
import java.io.Serializable;
1919

20+
import static java.lang.System.lineSeparator;
21+
2022
// 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)
2123
public class SortPomCfg implements Serializable {
2224
private static final long serialVersionUID = 1L;
@@ -25,7 +27,7 @@ public class SortPomCfg implements Serializable {
2527

2628
public String encoding = "UTF-8";
2729

28-
public String lineSeparator = System.getProperty("line.separator");
30+
public String lineSeparator = lineSeparator();
2931

3032
public boolean expandEmptyElements = true;
3133

lib/src/main/java/com/diffplug/spotless/sql/dbeaver/DBeaverSQLFormatterConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ public DBeaverSQLFormatterConfiguration(Properties properties) {
6767
private String getIndentString(String indentType, int indentSize) {
6868
char indentChar = indentType.equals("space") ? ' ' : '\t';
6969
StringBuilder stringBuilder = new StringBuilder();
70-
stringBuilder.append(String.valueOf(indentChar).repeat(Math.max(0, indentSize)));
70+
for (int i = 0; i < indentSize; i++) {
71+
stringBuilder.append(indentChar);
72+
}
7173
return stringBuilder.toString();
7274
}
7375

0 commit comments

Comments
 (0)