Merge branch 'main' into fix/ghservice-resource-leak

Author: jonesbusy

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/extractor/PluginMetadata.java

@@ -201,7 +201,10 @@ public Set<JDK> getJdks() {
         if (platforms == null) {
             platforms = new LinkedList<>();
         }
-        return platforms.stream().map(PlatformConfig::jdk).collect(HashSet::new, Set::add, Set::addAll);
+        return platforms.stream()
+                .map(PlatformConfig::jdk)
+                .filter(Objects::nonNull)
+                .collect(HashSet::new, Set::add, Set::addAll);
     }
 
     public Set<Platform> getPlatforms() {
@@ -219,9 +222,12 @@ public void setJdks(Set<JDK> jdkVersions) {
         if (platforms == null) {
             platforms = new ArrayList<>();
         }
-        platforms.addAll(jdkVersions.stream()
-                .map(jdk -> new PlatformConfig(Platform.UNKNOWN, jdk, null, true))
-                .toList());
+        if (jdkVersions != null) {
+            platforms.addAll(jdkVersions.stream()
+                    .filter(Objects::nonNull)
+                    .map(jdk -> new PlatformConfig(Platform.UNKNOWN, jdk, null, true))
+                    .toList());
+        }
     }
 
     public void setPlatforms(List<PlatformConfig> platforms) {