From f99b1685cf89edec6ef310a88e79f0cb445963d0 Mon Sep 17 00:00:00 2001 From: sebthom Date: Tue, 17 Sep 2024 18:14:48 +0200 Subject: [PATCH] fix(deps): bump vegardit-maven-parent from 3.1.7 to 6.1.0 --- eea-all/pom.xml | 4 ++++ eea-generator/pom.xml | 7 +++++++ .../com/vegardit/no_npe/eea_generator/EEAFile.java | 10 ++++++++-- pom.xml | 6 +++++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/eea-all/pom.xml b/eea-all/pom.xml index 5613871ab2..a57b9896ce 100644 --- a/eea-all/pom.xml +++ b/eea-all/pom.xml @@ -17,6 +17,10 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe no-npe-eea-all + + false + + diff --git a/eea-generator/pom.xml b/eea-generator/pom.xml index 5edc144351..da5e98f229 100644 --- a/eea-generator/pom.xml +++ b/eea-generator/pom.xml @@ -31,6 +31,13 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe + + com.vegardit.no-npe + no-npe-eea-all + 1.1.0 + provided + + org.eclipse.jdt org.eclipse.jdt.annotation diff --git a/eea-generator/src/main/java/com/vegardit/no_npe/eea_generator/EEAFile.java b/eea-generator/src/main/java/com/vegardit/no_npe/eea_generator/EEAFile.java index f8fd3f12fe..b2a7d08b92 100644 --- a/eea-generator/src/main/java/com/vegardit/no_npe/eea_generator/EEAFile.java +++ b/eea-generator/src/main/java/com/vegardit/no_npe/eea_generator/EEAFile.java @@ -17,9 +17,9 @@ import java.nio.file.StandardOpenOption; import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Deque; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; @@ -593,7 +593,13 @@ && contains(member.annotatedSignature.comment, MARKER_OVERRIDES)) { * @return true if modifications where written to disk, false was already up-to-date */ public boolean save(final Path rootPath, final @Nullable SaveOption... opts) throws IOException { - return save(rootPath, Arrays.stream(opts).filter(Objects::nonNull).collect(Collectors.toSet())); + final var uniqueOpts = new HashSet(); + for (final var opt : opts) { + if (opt != null) { + uniqueOpts.add(opt); + } + } + return save(rootPath, uniqueOpts); } /** diff --git a/pom.xml b/pom.xml index 28df43e273..210101f501 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ check for new dependency/plugin updates using: com.vegardit.maven vegardit-maven-parent - 3.1.7 + 6.1.0 com.vegardit.no-npe @@ -118,6 +118,10 @@ check for new dependency/plugin updates using: + + false + +