Skip to content

Commit b5e117e

Browse files
committed
fix: correct pmd warnings
1 parent b7aed37 commit b5e117e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.nio.file.Path;
2525
import java.util.HashMap;
2626
import java.util.List;
27+
import java.util.Locale;
2728
import java.util.Map;
2829
import java.util.Objects;
2930
import java.util.Properties;
@@ -208,7 +209,7 @@ private static String macOsFix(String binaryPath) {
208209
}
209210

210211
private static boolean isMacOs() {
211-
return System.getProperty("os.name").toLowerCase().contains("mac");
212+
return System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("mac");
212213
}
213214

214215
private String format(IdeaStepFormatterCleanupResources ideaStepFormatterCleanupResources, String unix, File file) throws Exception {
@@ -244,10 +245,14 @@ private File createIdeaPropertiesFile() {
244245
return ideaProps.toFile(); // only create if it does not exist
245246
}
246247

247-
ThrowingEx.run(() -> Files.createDirectories(ideaProps.getParent()));
248+
Path parent = ideaProps.getParent();
249+
if (parent == null) {
250+
throw new IllegalStateException(String.format("Parent directory for IDEA properties file %s cannot be null", ideaProps));
251+
}
252+
ThrowingEx.run(() -> Files.createDirectories(parent));
248253

249-
Path configPath = ideaProps.getParent().resolve("config");
250-
Path systemPath = ideaProps.getParent().resolve("system");
254+
Path configPath = parent.resolve("config");
255+
Path systemPath = parent.resolve("system");
251256

252257
Properties properties = new Properties();
253258
properties.putAll(ideaProperties);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.nio.file.Path;
2121
import java.util.HashMap;
2222
import java.util.Map;
23+
import java.util.Objects;
2324
import java.util.Optional;
2425
import java.util.stream.Stream;
2526

@@ -70,7 +71,7 @@ private static Stream<Path> candidateTestEnvLocations() {
7071
builder.add(
7172
Path.of(System.getProperty("user.dir"), "testenv.properties"));
7273
builder.add(
73-
Path.of(System.getProperty("user.dir")).getParent().resolve("testenv.properties"));
74+
Objects.requireNonNull(Path.of(System.getProperty("user.dir")).getParent()).resolve("testenv.properties"));
7475
return builder.build();
7576
}
7677

0 commit comments

Comments
 (0)