Use Java 17 language features (jenkinsci#129)

instanceof pattern matching
MarkEWaite · Oct 22, 2024 · 74d33fa · 74d33fa
1 parent 2f7e372
commit 74d33fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/jenkins/branch/buildstrategies/basic/ChangeRequestBuildStrategyImpl.java b/src/main/java/jenkins/branch/buildstrategies/basic/ChangeRequestBuildStrategyImpl.java
@@ -144,10 +144,9 @@ public boolean isAutomaticBuild(
             return false;
         }
         if (ignoreTargetOnlyChanges
-                && currRevision instanceof ChangeRequestSCMRevision
-                && lastBuiltRevision instanceof ChangeRequestSCMRevision) {
-            ChangeRequestSCMRevision<?> curr = (ChangeRequestSCMRevision<?>) currRevision;
-            if (curr.isMerge() && curr.equivalent((ChangeRequestSCMRevision<?>) lastBuiltRevision)) {
+                && currRevision instanceof ChangeRequestSCMRevision<?> curr
+                && lastBuiltRevision instanceof ChangeRequestSCMRevision<?> revision) {
+            if (curr.isMerge() && curr.equivalent(revision)) {
                 return false;
             }
         }

diff --git a/src/test/java/jenkins/branch/buildstrategies/basic/harness/BasicBranchProjectFactory.java b/src/test/java/jenkins/branch/buildstrategies/basic/harness/BasicBranchProjectFactory.java
@@ -84,8 +84,7 @@ public FreeStyleProject setBranch(FreeStyleProject project, Branch branch) {
 
     @Override
     public boolean isProject(Item item) {
-        return item instanceof FreeStyleProject
-                && ((FreeStyleProject) item).getProperty(BasicBranchProperty.class) != null;
+        return item instanceof FreeStyleProject fsp && fsp.getProperty(BasicBranchProperty.class) != null;
     }
 
     @Extension