Use Java 17 language features (#1749)

* Use Java 17 pattern matching instanceof

Makes the code easier to read by avoding the cast that often follows
an instanceof.

* Use Java 17 @serial annotation

Annotation that may allow future checks for serialization.  No real
benefit today as far as I can tell.

* Use Java 17 string formatting

Slight simplification of the code through OpenRewrite

Author: MarkEWaite

src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java

@@ -610,12 +610,11 @@ protected Object readResolve() throws ObjectStreamException {
 
     public static GitLabPushTrigger getFromJob(Job<?, ?> job) {
         GitLabPushTrigger trigger = null;
-        if (job instanceof ParameterizedJobMixIn.ParameterizedJob) {
-            ParameterizedJobMixIn.ParameterizedJob<?, ?> p = (ParameterizedJobMixIn.ParameterizedJob) job;
+        if (job instanceof ParameterizedJobMixIn.ParameterizedJob<?, ?> p) {
             Collection<Trigger<?>> triggerList = p.getTriggers().values();
             for (Trigger<?> t : triggerList) {
-                if (t instanceof GitLabPushTrigger) {
-                    trigger = (GitLabPushTrigger) t;
+                if (t instanceof GitLabPushTrigger pushTrigger) {
+                    trigger = pushTrigger;
                 }
             }
         }

src/main/java/com/dabsquared/gitlabjenkins/connection/GitLabCredentialMatcher.java

@@ -3,10 +3,12 @@
 import com.cloudbees.plugins.credentials.Credentials;
 import com.cloudbees.plugins.credentials.CredentialsMatcher;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import java.io.Serial;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 
 public class GitLabCredentialMatcher implements CredentialsMatcher {
 
+    @Serial
     private static final long serialVersionUID = -6684402077086938070L;
 
     @Override

src/main/java/com/dabsquared/gitlabjenkins/environment/GitLabEnvironmentContributor.java

@@ -20,8 +20,8 @@ public class GitLabEnvironmentContributor extends EnvironmentContributor {
     public void buildEnvironmentFor(@NonNull Run r, @NonNull EnvVars envs, @NonNull TaskListener listener)
             throws IOException, InterruptedException {
         GitLabWebHookCause cause = null;
-        if (r instanceof MatrixRun) {
-            MatrixBuild parent = ((MatrixRun) r).getParentBuild();
+        if (r instanceof MatrixRun run) {
+            MatrixBuild parent = run.getParentBuild();
             if (parent != null) {
                 cause = (GitLabWebHookCause) parent.getCause(GitLabWebHookCause.class);
             }

src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/ResteasyGitLabClientBuilder.java

@@ -204,11 +204,11 @@ private String getApiToken(GitlabCredentialResolver credentialResolver) {
             }
 
             if (credentials != null) {
-                if (credentials instanceof GitLabApiToken) {
-                    return ((GitLabApiToken) credentials).getApiToken().getPlainText();
+                if (credentials instanceof GitLabApiToken token) {
+                    return token.getApiToken().getPlainText();
                 }
-                if (credentials instanceof StringCredentials) {
-                    return ((StringCredentials) credentials).getSecret().getPlainText();
+                if (credentials instanceof StringCredentials stringCredentials) {
+                    return stringCredentials.getSecret().getPlainText();
                 }
             }
             throw new IllegalStateException(

src/main/java/com/dabsquared/gitlabjenkins/publisher/GitLabAcceptMergeRequestPublisher.java

@@ -71,7 +71,7 @@ protected void perform(Run<?, ?> build, TaskListener listener, GitLabClient clie
                             mergeRequest.getProjectId(), e.getMessage());
             LOGGER.log(
                     Level.SEVERE,
-                    String.format("Failed to accept merge request for project '%s'", mergeRequest.getProjectId()),
+                    "Failed to accept merge request for project '%s'".formatted(mergeRequest.getProjectId()),
                     e);
         }
     }

src/main/java/com/dabsquared/gitlabjenkins/publisher/GitLabMessagePublisher.java

@@ -187,8 +187,7 @@ protected void perform(Run<?, ?> build, TaskListener listener, GitLabClient clie
                             mergeRequest.getProjectId(), e.getMessage());
             LOGGER.log(
                     Level.SEVERE,
-                    String.format(
-                            "Failed to add comment on Merge Request for project '%s'", mergeRequest.getProjectId()),
+                    "Failed to add comment on Merge Request for project '%s'".formatted(mergeRequest.getProjectId()),
                     e);
         }
     }

src/main/java/com/dabsquared/gitlabjenkins/publisher/GitLabVotePublisher.java

@@ -68,8 +68,7 @@ protected void perform(Run<?, ?> build, TaskListener listener, GitLabClient clie
                             mergeRequest.getProjectId(), e.getMessage());
             LOGGER.log(
                     Level.SEVERE,
-                    String.format(
-                            "Failed to remove vote on Merge Request for project '%s'", mergeRequest.getProjectId()),
+                    "Failed to remove vote on Merge Request for project '%s'".formatted(mergeRequest.getProjectId()),
                     e);
         }
 
@@ -91,7 +90,7 @@ protected void perform(Run<?, ?> build, TaskListener listener, GitLabClient clie
                             mergeRequest.getProjectId(), e.getMessage());
             LOGGER.log(
                     Level.SEVERE,
-                    String.format("Failed to add vote on Merge Request for project '%s'", mergeRequest.getProjectId()),
+                    "Failed to add vote on Merge Request for project '%s'".formatted(mergeRequest.getProjectId()),
                     e);
         }
     }

src/main/java/com/dabsquared/gitlabjenkins/trigger/branch/ProjectBranchesProvider.java

@@ -158,8 +158,8 @@ private URIish getFirstRepoURL(List<RemoteConfig> repositories) {
     private GitSCM getGitSCM(SCMTriggerItem item) {
         if (item != null) {
             for (SCM scm : item.getSCMs()) {
-                if (scm instanceof GitSCM) {
-                    return (GitSCM) scm;
+                if (scm instanceof GitSCM gitSCM) {
+                    return gitSCM;
                 }
             }
         }

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/AbstractWebHookTriggerHandler.java

@@ -146,8 +146,7 @@ protected URIish retrieveUrIish(WebHook hook) {
 
     protected void scheduleBuild(Job<?, ?> job, Action[] actions) {
         int projectBuildDelay = 0;
-        if (job instanceof ParameterizedJobMixIn.ParameterizedJob) {
-            ParameterizedJobMixIn.ParameterizedJob abstractProject = (ParameterizedJobMixIn.ParameterizedJob) job;
+        if (job instanceof ParameterizedJobMixIn.ParameterizedJob abstractProject) {
             if (abstractProject.getQuietPeriod() > projectBuildDelay) {
                 projectBuildDelay = abstractProject.getQuietPeriod();
             }
@@ -168,8 +167,8 @@ protected Job asJob() {
     private GitSCM getGitSCM(SCMTriggerItem item) {
         if (item != null) {
             for (SCM scm : item.getSCMs()) {
-                if (scm instanceof GitSCM) {
-                    return (GitSCM) scm;
+                if (scm instanceof GitSCM gitSCM) {
+                    return gitSCM;
                 }
             }
         }

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandler.java

@@ -47,8 +47,8 @@ public void cancelPendingBuilds(Job<?, ?> job, Integer projectId, String branch)
 
     private GitLabWebHookCause getGitLabWebHookCauseData(Queue.Item item) {
         for (Cause cause : item.getCauses()) {
-            if (cause instanceof GitLabWebHookCause) {
-                return (GitLabWebHookCause) cause;
+            if (cause instanceof GitLabWebHookCause hookCause) {
+                return hookCause;
             }
         }
         return null;
@@ -87,9 +87,9 @@ private void setCommitStatusCancelledIfNecessary(CauseData causeData, Job<?, ?>
     }
 
     public static String resolvePendingBuildName(Job<?, ?> job) {
-        if (job instanceof AbstractProject) {
-            GitLabCommitStatusPublisher publisher = (GitLabCommitStatusPublisher)
-                    ((AbstractProject) job).getPublishersList().get(GitLabCommitStatusPublisher.class);
+        if (job instanceof AbstractProject project) {
+            GitLabCommitStatusPublisher publisher =
+                    (GitLabCommitStatusPublisher) project.getPublishersList().get(GitLabCommitStatusPublisher.class);
             if (publisher != null) {
                 return publisher.getName();
             }