Skip to content

Commit b8b274c

Browse files
author
Vincent Potucek
committed
[openrewrite] StringRulesRecipes
1 parent eb2b071 commit b8b274c

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

lib/src/main/java/com/diffplug/spotless/npm/NpmPathResolver.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
*/
1616
package com.diffplug.spotless.npm;
1717

18-
import static java.util.Objects.requireNonNullElseGet;
19-
2018
import java.io.File;
2119
import java.io.Serial;
2220
import java.io.Serializable;
2321
import java.util.ArrayList;
2422
import java.util.List;
23+
import java.util.Optional;
2524

2625
public class NpmPathResolver implements Serializable {
2726
@Serial
@@ -86,12 +85,10 @@ public File resolveNodeExecutable() {
8685
}
8786

8887
public String resolveNpmrcContent() {
89-
File npmrcFile = requireNonNullElseGet(this.explicitNpmrcFile, () -> new NpmrcResolver(additionalNpmrcLocations).tryFind()
90-
.orElse(null));
91-
if (npmrcFile != null) {
92-
return NpmResourceHelper.readUtf8StringFromFile(npmrcFile);
93-
}
94-
return null;
88+
return Optional.ofNullable(explicitNpmrcFile)
89+
.or(() -> new NpmrcResolver(additionalNpmrcLocations).tryFind())
90+
.map(NpmResourceHelper::readUtf8StringFromFile)
91+
.orElse(null);
9592
}
9693

9794
}

0 commit comments

Comments
 (0)