Skip to content

Commit 56025b0

Browse files
committed
Fix possible nullpointer if jenkinsVersion is null
1 parent 86b064c commit 56025b0

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

  • plugin-modernizer-core/src
    • main
    • test/java/io/jenkins/tools/pluginmodernizer/core/model

plugin-modernizer-core/src/main/java/io/jenkins/tools/pluginmodernizer/core/model/JDK.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ public static List<JDK> all() {
284284
* @return The list of buildable JDKs
285285
*/
286286
public static List<JDK> get(String jenkinsVersion) {
287+
if (jenkinsVersion == null || jenkinsVersion.isEmpty()) {
288+
return List.of(JDK.min());
289+
}
287290
ComparableVersion jenkinsVersionComparable = new ComparableVersion(jenkinsVersion);
288291
return Arrays.stream(JDK.values())
289292

plugin-modernizer-core/src/main/resources/META-INF/rewrite/recipes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ recipeList:
182182
type: specs.openrewrite.org/v1beta/recipe
183183
name: io.jenkins.tools.pluginmodernizer.RemoveDevelopersTag
184184
displayName: Remove developers tag
185-
tags: ['chore']
185+
tags: ['chore', 'skip-verification']
186186
description: Remove developers tag from the pom.xml.
187187
recipeList:
188188
- org.openrewrite.xml.RemoveXmlTag:

plugin-modernizer-core/src/test/java/io/jenkins/tools/pluginmodernizer/core/model/JDKTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ public void filter() {
107107
@Test
108108
public void getBuildableJdk() {
109109

110+
assertEquals(1, JDK.get(null).size());
111+
assertEquals(JDK.JAVA_8, JDK.get(null).get(0));
112+
110113
assertEquals(1, JDK.get("2.163").size());
111114
assertEquals(JDK.JAVA_8, JDK.get("2.163").get(0));
112115

@@ -148,6 +151,10 @@ public void getBuildableJdk() {
148151
assertEquals(2, JDK.get("2.479.1").size());
149152
assertEquals(JDK.JAVA_17, JDK.get("2.479.1").get(0));
150153
assertEquals(JDK.JAVA_21, JDK.get("2.479.1").get(1));
154+
155+
assertEquals(2, JDK.get("2.492.1").size());
156+
assertEquals(JDK.JAVA_17, JDK.get("2.492.1").get(0));
157+
assertEquals(JDK.JAVA_21, JDK.get("2.492.1").get(1));
151158
}
152159

153160
@Test

0 commit comments

Comments
 (0)