Use Java 17 features, remove deprecations, cleanup

Author: strangelookingnerd

Jenkinsfile-integ

@@ -6,13 +6,13 @@ pipeline {
 		stage('Linux Build & Test') {
 
 		    environment {
-                JAVA_HOME = '/usr/lib/jvm/java-11-openjdk-amd64'
+                JAVA_HOME = '/usr/lib/jvm/java-17-openjdk-amd64'
             }
-			
+
 			agent {
 				label 'p4java'
 			}
-			
+
 			stages {
 				stage('Compile') {
 					steps {
@@ -49,10 +49,10 @@ pipeline {
 				}
 			}
 		}
-		
+
 		stage('Windows Build & Test') {
 		    environment {
-                JAVA_HOME = "C:\\Program Files\\Java\\jdk-11.0.16.1"
+                JAVA_HOME = "C:\\Program Files\\Java\\jdk-17.0.14"
             }
 			agent {
 				label 'p4java-win'
@@ -86,7 +86,7 @@ pipeline {
 				}
 			}
 		}
-		
+
 		stage('Launch system tests') {
 			steps {
 				build job: 'jenkins-system-tests/main', wait: false

pom.xml

@@ -70,14 +70,14 @@
   <dependencies>
 
     <dependency>
-      <groupId>com.perforce</groupId>
-      <artifactId>p4java</artifactId>
-      <version>2024.2.2695691</version>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>io.jenkins.plugins</groupId>
-      <artifactId>commons-lang3-api</artifactId>
+      <groupId>com.perforce</groupId>
+      <artifactId>p4java</artifactId>
+      <version>2024.2.2695691</version>
     </dependency>
 
     <dependency>
@@ -92,24 +92,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.mashape.unirest</groupId>
-      <artifactId>unirest-java</artifactId>
-      <version>1.4.9</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.json</groupId>
-          <artifactId>json</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>apache-httpcomponents-client-4-api</artifactId>
+      <groupId>com.konghq</groupId>
+      <artifactId>unirest-java-core</artifactId>
+      <version>4.4.5</version>
     </dependency>
 
     <!-- Jenkins dependencies -->
@@ -221,11 +206,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.jenkins.plugins</groupId>
-      <artifactId>json-api</artifactId>
-    </dependency>
-
   </dependencies>
 
   <build>

src/main/java/org/jenkinsci/plugins/p4/ConfigurationListener.java

@@ -24,13 +24,11 @@ public class ConfigurationListener extends SaveableListener {
 	private static final Logger logger = Logger.getLogger(ConfigurationListener.class.getName());
 
 	public void onChange(Saveable o, XmlFile xml) {
-		if (!(o instanceof PerforceScm.DescriptorImpl)) {
+		if (!(o instanceof DescriptorImpl p4scm)) {
 			// must be a PerforceScm
 			return;
 		}
 
-		PerforceScm.DescriptorImpl p4scm = (PerforceScm.DescriptorImpl) o;
-
 		// Exit early if disabled
 		if (!p4scm.isAutoSave()) {
 			return;
@@ -80,7 +78,7 @@ private ClientHelper getClientHelper(DescriptorImpl p4scm) throws IOException {
 			depotPath = "\"" + depotPath + "\"";
 		}
 
-		Jenkins j = Jenkins.getInstance();
+		Jenkins j = Jenkins.get();
 		String rootPath = j.getRootDir().getCanonicalPath();
 
 		String view = ViewMapHelper.getClientView(depotPath, clientName, true);
@@ -91,6 +89,6 @@ private ClientHelper getClientHelper(DescriptorImpl p4scm) throws IOException {
 		workspace.setExpand(new HashMap<>());
 		workspace.setRootPath(rootPath);
 
-		return new ClientHelper(Jenkins.getInstance(), credential, listener, workspace);
+		return new ClientHelper(Jenkins.get(), credential, listener, workspace);
 	}
 }

src/main/java/org/jenkinsci/plugins/p4/PerforceScm.java

@@ -2,6 +2,7 @@
 
 import com.cloudbees.plugins.credentials.CredentialsProvider;
 import com.perforce.p4java.exception.P4JavaException;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.AbortException;
 import hudson.EnvVars;
 import hudson.Extension;
@@ -88,7 +89,6 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -160,12 +160,11 @@ public static PerforceScm convertToPerforceScm(SCM scm) {
 		if (scm instanceof PerforceScm) {
 			perforceScm = (PerforceScm) scm;
 		} else {
-			Jenkins jenkins = Jenkins.getInstance();
+			Jenkins jenkins = Jenkins.get();
 			if (jenkins != null) {
 				Plugin multiSCMPlugin = jenkins.getPlugin("multiple-scms");
 				if (multiSCMPlugin != null) {
-					if (scm instanceof MultiSCM) {
-						MultiSCM multiSCM = (MultiSCM) scm;
+					if (scm instanceof MultiSCM multiSCM) {
 						for (SCM configuredSCM : multiSCM.getConfiguredSCMs()) {
 							if (configuredSCM instanceof PerforceScm) {
 								perforceScm = (PerforceScm) configuredSCM;
@@ -235,40 +234,36 @@ public PerforceScm(String credential, Workspace workspace, Populate populate) {
 		this.revision = null;
 	}
 
+	@NonNull
 	@Override
 	public String getKey() {
 		String delim = "-";
-		StringBuffer key = new StringBuffer("p4");
+		StringBuilder key = new StringBuilder("p4");
 
 		// add Credential
 		key.append(delim);
 		key.append(credential);
 
 		// add Mapping/Stream
 		key.append(delim);
-		if (workspace instanceof ManualWorkspaceImpl) {
-			ManualWorkspaceImpl ws = (ManualWorkspaceImpl) workspace;
+		if (workspace instanceof ManualWorkspaceImpl ws) {
 			key.append(ws.getSpec().getView());
 			key.append(ws.getSpec().getStreamName());
 			key.append(ws.getName());
 		}
-		if (workspace instanceof StreamWorkspaceImpl) {
-			StreamWorkspaceImpl ws = (StreamWorkspaceImpl) workspace;
+		if (workspace instanceof StreamWorkspaceImpl ws) {
 			key.append(ws.getStreamName());
 			key.append(ws.getStreamAtChange());
 			key.append(ws.getName());
 		}
-		if (workspace instanceof SpecWorkspaceImpl) {
-			SpecWorkspaceImpl ws = (SpecWorkspaceImpl) workspace;
+		if (workspace instanceof SpecWorkspaceImpl ws) {
 			key.append(ws.getSpecPath());
 			key.append(ws.getName());
 		}
-		if (workspace instanceof StaticWorkspaceImpl) {
-			StaticWorkspaceImpl ws = (StaticWorkspaceImpl) workspace;
+		if (workspace instanceof StaticWorkspaceImpl ws) {
 			key.append(ws.getName());
 		}
-		if (workspace instanceof TemplateWorkspaceImpl) {
-			TemplateWorkspaceImpl ws = (TemplateWorkspaceImpl) workspace;
+		if (workspace instanceof TemplateWorkspaceImpl ws) {
 			key.append(ws.getTemplateName());
 			key.append(ws.getName());
 		}
@@ -315,8 +310,8 @@ public static P4Browser findBrowser(String scmCredential) {
 	 * the build as an Action for later retrieval.
 	 */
 	@Override
-	public SCMRevisionState calcRevisionsFromBuild(Run<?, ?> run, FilePath buildWorkspace, Launcher launcher,
-												   TaskListener listener) throws IOException, InterruptedException {
+	public SCMRevisionState calcRevisionsFromBuild(@NonNull Run<?, ?> run, FilePath buildWorkspace, Launcher launcher,
+	                                               @NonNull TaskListener listener) {
 		// return the Perforce change; this gets updated during polling...
 		return new PerforceRevisionState(new P4LabelRef("now"));
 	}
@@ -327,8 +322,8 @@ public SCMRevisionState calcRevisionsFromBuild(Run<?, ?> run, FilePath buildWork
 	 * detected by this poll.
 	 */
 	@Override
-	public PollingResult compareRemoteRevisionWith(Job<?, ?> job, Launcher launcher, FilePath buildWorkspace,
-												   TaskListener listener, SCMRevisionState baseline) throws IOException, InterruptedException {
+	public PollingResult compareRemoteRevisionWith(@NonNull Job<?, ?> job, Launcher launcher, FilePath buildWorkspace,
+	                                               @NonNull TaskListener listener, @NonNull SCMRevisionState baseline) throws IOException, InterruptedException {
 
 		String jobName = job.getName();
 		logger.finer("P4: polling[" + jobName + "] started...");
@@ -338,10 +333,9 @@ public PollingResult compareRemoteRevisionWith(Job<?, ?> job, Launcher launcher,
 		// Get last run and build workspace
 		Run<?, ?> lastRun = job.getLastBuild();
 
-		Queue.Item[] items = Jenkins.getInstance().getQueue().getItems();
+		Queue.Item[] items = Jenkins.get().getQueue().getItems();
 		for (Queue.Item item : items) {
-			if (item.task instanceof WorkflowJob) {
-				WorkflowJob task = (WorkflowJob) item.task;
+			if (item.task instanceof WorkflowJob task) {
 				if (task.equals(job)) {
 					if (item instanceof Queue.WaitingItem) {
 						logger.info("P4: polling[" + jobName + "] skipping WaitingItem");
@@ -450,8 +444,7 @@ private PollingResult pollWorkspace(EnvVars envVars, TaskListener listener, File
 			return PollingResult.NO_CHANGES;
 		} else {
 			changes.forEach((c) -> listener.getLogger().println("P4: Polling found change: " + c));
-			if (baseline instanceof PerforceRevisionState) {
-				PerforceRevisionState p4Baseline = (PerforceRevisionState) baseline;
+			if (baseline instanceof PerforceRevisionState p4Baseline) {
 				setLatestChange(changes, listener, p4Baseline);
 			}
 			return PollingResult.BUILD_NOW;
@@ -522,8 +515,8 @@ private List<P4Ref> lookForChanges(FilePath buildWorkspace, Workspace ws, Run<?,
 	 * workspace. Authorisation
 	 */
 	@Override
-	public void checkout(Run<?, ?> run, Launcher launcher, FilePath buildWorkspace, TaskListener listener,
-						 File changelogFile, SCMRevisionState baseline) throws IOException, InterruptedException {
+	public void checkout(@NonNull Run<?, ?> run, @NonNull Launcher launcher, @NonNull FilePath buildWorkspace, @NonNull TaskListener listener,
+	                     File changelogFile, SCMRevisionState baseline) throws IOException, InterruptedException {
 
 		String jobName = run.getParent().getName();
 		logger.finer("P4: checkout[" + jobName + "] started...");
@@ -610,16 +603,15 @@ To help lookForChanges() find the correct change to build, sending it the previo
 
 		// If the Latest Change filter is set, apply the baseline change to the checkout task.
 		if (FilterLatestChangeImpl.isActive(getFilter())) {
-			if (baseline instanceof PerforceRevisionState) {
-				PerforceRevisionState p4baseline = (PerforceRevisionState) baseline;
+			if (baseline instanceof PerforceRevisionState p4baseline) {
 				log.println("Baseline: " + p4baseline.getChange().toString());
 				task.setBuildChange(p4baseline.getChange());
 			}
 		}
 
 		// SCMRevision build per change
 		if (revision != null) {
-			List<P4Ref> changes = Arrays.asList(revision);
+			List<P4Ref> changes = List.of(revision);
 			task.setIncrementalChanges(changes);
 		}
 
@@ -726,27 +718,24 @@ private String getScriptPath(Run<?, ?> run) {
 			return script;
 		}
 
-		if (!(run instanceof WorkflowRun)) {
+		if (!(run instanceof WorkflowRun workflowRun)) {
 			return null;
 		}
 
-		WorkflowRun workflowRun = (WorkflowRun) run;
 		WorkflowJob job = workflowRun.getParent();
 		return getScriptPath(job);
 	}
 
 	public String getScriptPath(Item item) {
-		if (!(item instanceof WorkflowJob)) {
+		if (!(item instanceof WorkflowJob job)) {
 			return null;
 		}
 
-		WorkflowJob job = (WorkflowJob) item;
 		FlowDefinition definition = job.getDefinition();
-		if (!(definition instanceof CpsScmFlowDefinition)) {
+		if (!(definition instanceof CpsScmFlowDefinition cps)) {
 			return null;
 		}
 
-		CpsScmFlowDefinition cps = (CpsScmFlowDefinition) definition;
 		if (!(cps.getScm() instanceof PerforceScm)) {
 			return null;
 		}
@@ -776,8 +765,7 @@ private void cleanupPerforceClient(Run<?, ?> run, FilePath buildWorkspace, TaskL
 
 	// Get Matrix Execution options
 	private MatrixExecutionStrategy getMatrixExecutionStrategy(Job<?, ?> job) {
-		if (job instanceof MatrixProject) {
-			MatrixProject matrixProj = (MatrixProject) job;
+		if (job instanceof MatrixProject matrixProj) {
 			return matrixProj.getExecutionStrategy();
 		}
 		return null;
@@ -795,7 +783,7 @@ boolean isBuildParent(Job<?, ?> job) {
 	}
 
 	private List<P4ChangeEntry> calculateChanges(Run<?, ?> run, CheckoutTask task) {
-		List<P4ChangeEntry> list = new ArrayList<P4ChangeEntry>();
+		List<P4ChangeEntry> list = new ArrayList<>();
 
 		Run<?, ?> lastBuild;
 		PerforceScm.DescriptorImpl scm = getDescriptor();
@@ -834,7 +822,7 @@ private List<P4ChangeEntry> calculateChanges(Run<?, ?> run, CheckoutTask task) {
 	}
 
 	// Post Jenkins 2.60 JENKINS-37584 JENKINS-40885 JENKINS-52806 JENKINS-60074
-	public void buildEnvironment(Run<?, ?> run, Map<String, String> env) {
+	public void buildEnvironment(@NonNull Run<?, ?> run, @NonNull Map<String, String> env) {
 		P4EnvironmentContributor.buildEnvironment(TagAction.getLastAction(run), env);
 		P4EnvironmentContributor.buildEnvironment(tagAction, env);
 	}
@@ -899,7 +887,7 @@ public ChangeLogParser createChangeLogParser() {
 	 * opportunity to perform clean up.
 	 */
 	@Override
-	public boolean processWorkspaceBeforeDeletion(Job<?, ?> job, FilePath buildWorkspace, Node node)
+	public boolean processWorkspaceBeforeDeletion(@NonNull Job<?, ?> job, @NonNull FilePath buildWorkspace, @NonNull Node node)
 			throws IOException, InterruptedException {
 
 		logger.finer("processWorkspaceBeforeDeletion");
@@ -928,8 +916,7 @@ public boolean processWorkspaceBeforeDeletion(Job<?, ?> job, FilePath buildWorks
 				return false;
 			}
 			//JENKINS-60144 Checking if the template ws exists before deleting client, otherwise it throws exception along the line.
-			if (workspace instanceof TemplateWorkspaceImpl) {
-				TemplateWorkspaceImpl template = (TemplateWorkspaceImpl) workspace;
+			if (workspace instanceof TemplateWorkspaceImpl template) {
 				boolean exists = template.templateExists(connection.getConnection());
 				if (!exists) {
 					return false;
@@ -1059,6 +1046,7 @@ public DescriptorImpl() {
 		 * Returns the name of the SCM, this is the name that will show up next
 		 * to CVS and Subversion when configuring a job.
 		 */
+		@NonNull
 		@Override
 		public String getDisplayName() {
 			return "Perforce Software";
@@ -1070,7 +1058,7 @@ public boolean isApplicable(Job project) {
 		}
 
 		@Override
-		public SCM newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
+		public SCM newInstance(StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
 			PerforceScm scm = (PerforceScm) super.newInstance(req, formData);
 			return scm;
 		}
@@ -1083,7 +1071,7 @@ public SCM newInstance(StaplerRequest2 req, JSONObject formData) throws FormExce
 		 * defined in the global.jelly page.
 		 */
 		@Override
-		public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
+		public boolean configure(StaplerRequest2 req, JSONObject json) {
 
 			try {
 				autoSave = json.getBoolean("autoSave");