summaryrefslogtreecommitdiffstats
path: root/bundle-plugin
diff options
context:
space:
mode:
authorgjoranv <gv@yahooinc.com>2023-06-29 11:14:05 +0200
committergjoranv <gv@yahooinc.com>2023-07-03 22:37:54 +0200
commitca759d9e2917f1cfb185bd6d460b61f1d7dec39f (patch)
tree684a9d45bbbe14870a28a200b3d21b9e86077e31 /bundle-plugin
parent9472d0040acfd2a3efa1394169f916d885e50f2e (diff)
Use early return
Diffstat (limited to 'bundle-plugin')
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
index fdb2cae2187..7ea1b11b935 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
@@ -254,15 +254,14 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
Set<ProvidedArtifact> included = includedArtifacts.stream().map(ProvidedArtifact::new).collect(Collectors.toSet());
Set<ProvidedArtifact> providedIncluded = Sets.intersection(included, new HashSet<>(providedArtifacts));
+ if (providedIncluded.isEmpty()) return;
- if (! providedIncluded.isEmpty()) {
- List<String> sorted = providedIncluded.stream()
- .map(ProvidedArtifact::stringValue)
- .sorted().toList();
+ List<String> sorted = providedIncluded.stream()
+ .map(ProvidedArtifact::stringValue)
+ .sorted().toList();
- // TODO: improve error message
- warnOrThrow("Artifacts provided from Jdisc runtime are included in compile scope: " + sorted);
- }
+ // TODO: improve error message
+ warnOrThrow("Artifacts provided from Jdisc runtime are included in compile scope: " + sorted);
}
private static String trimWhitespace(Optional<String> lines) {