File tree Expand file tree Collapse file tree
lib/src/main/java/com/diffplug/spotless/npm Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1515 */
1616package com .diffplug .spotless .npm ;
1717
18- import static java .util .Objects .requireNonNullElseGet ;
19-
2018import java .io .File ;
2119import java .io .Serial ;
2220import java .io .Serializable ;
2321import java .util .ArrayList ;
2422import java .util .List ;
23+ import java .util .Optional ;
2524
2625public 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}
You can’t perform that action at this time.
0 commit comments