Skip to content

Commit 25996a4

Browse files
committed
AbstractMavenGitCodeFormatMojo#formatterOptions Map can be null
1 parent 8df95d4 commit 25996a4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

core/src/main/java/com/cosium/code/format/AbstractMavenGitCodeFormatMojo.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
import java.nio.file.Paths;
1212
import java.util.ArrayList;
1313
import java.util.Collection;
14+
import java.util.Collections;
1415
import java.util.List;
1516
import java.util.Map;
17+
import java.util.Optional;
1618
import java.util.ServiceLoader;
1719
import java.util.stream.Collectors;
1820
import java.util.stream.Stream;
@@ -85,7 +87,8 @@ private List<CodeFormatter> createCodeFormatters() {
8587
ServiceLoader.load(CodeFormatterFactory.class).forEach(formatterFactories::add);
8688

8789
CodeFormatterConfigurationFactory formatterConfigurationFactory =
88-
new CodeFormatterConfigurationFactory(formatterOptions);
90+
new CodeFormatterConfigurationFactory(
91+
Optional.ofNullable(formatterOptions).orElseGet(Collections::emptyMap));
8992

9093
return formatterFactories.stream()
9194
.map(

core/src/main/java/com/cosium/code/format/formatter/CodeFormatterConfigurationFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.cosium.code.format.formatter;
22

3+
import static java.util.Objects.requireNonNull;
4+
35
import com.cosium.code.format_spi.CodeFormatterConfiguration;
46
import java.util.Map;
57

@@ -11,7 +13,7 @@ public class CodeFormatterConfigurationFactory {
1113
private final Map<String, String> globalConfiguration;
1214

1315
public CodeFormatterConfigurationFactory(Map<String, String> globalConfiguration) {
14-
this.globalConfiguration = globalConfiguration;
16+
this.globalConfiguration = requireNonNull(globalConfiguration);
1517
}
1618

1719
public CodeFormatterConfiguration build(String formatterConfigurationId) {

0 commit comments

Comments
 (0)