commiting to some of the code issues I got

shivajee98 · Jan 13, 2024 · 6c6288f · 6c6288f
1 parent 10985b7
commit 6c6288f
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 19 deletions.
diff --git a/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java b/src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
@@ -50,6 +50,8 @@
 import java.io.ObjectStreamException;
 import java.security.SecureRandom;
 import java.util.Collection;
+import java.util.Objects;
+
 import jenkins.model.Jenkins;
 import jenkins.model.ParameterizedJobMixIn;
 import jenkins.triggers.SCMTriggerItem.SCMTriggerItems;
@@ -187,9 +189,11 @@ public GitLabPushTrigger() {}
     @Initializer(after = InitMilestone.JOB_LOADED)
     public static void migrateJobs() throws IOException {
         GitLabPushTrigger.DescriptorImpl oldConfig = Trigger.all().get(GitLabPushTrigger.DescriptorImpl.class);
+        assert oldConfig != null;
         if (!oldConfig.jobsMigrated) {
             GitLabConnectionConfig gitLabConfig =
-                    (GitLabConnectionConfig) Jenkins.getInstance().getDescriptor(GitLabConnectionConfig.class);
+                    (GitLabConnectionConfig) Objects.requireNonNull(Jenkins.getInstance()).getDescriptor(GitLabConnectionConfig.class);
+            assert gitLabConfig != null;
             gitLabConfig
                     .getConnections()
                     .add(new GitLabConnection(
@@ -217,7 +221,7 @@ public static void migrateJobs() throws IOException {
             oldConfig.save();
         }
         if (!oldConfig.jobsMigrated2) {
-            for (AbstractProject<?, ?> project : Jenkins.getInstance().getAllItems(AbstractProject.class)) {
+            for (AbstractProject<?, ?> project : Objects.requireNonNull(Jenkins.getInstance()).getAllItems(AbstractProject.class)) {
                 GitLabPushTrigger trigger = project.getTrigger(GitLabPushTrigger.class);
                 if (trigger != null) {
                     if (trigger.addNoteOnMergeRequest) {
@@ -655,7 +659,7 @@ public String getDisplayName() {
 
         private StringBuilder retrieveProjectUrl(Job<?, ?> project) {
             return new StringBuilder()
-                    .append(Jenkins.getInstance().getRootUrl())
+                    .append(Objects.requireNonNull(Jenkins.getInstance()).getRootUrl())
                     .append(GitLabWebHook.WEBHOOK_URL)
                     .append(retrieveParentUrl(project))
                     .append('/')

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionProperty.java b/src/main/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionProperty.java
@@ -30,6 +30,8 @@
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
+import java.util.Objects;
+
 /**
  * @author Robin Müller
  */
@@ -86,9 +88,7 @@ public static GitLabClient getClient(@NonNull Run<?, ?> build) {
         Job<?, ?> job = build.getParent();
         if (job != null) {
             final GitLabConnectionProperty connectionProperty = job.getProperty(GitLabConnectionProperty.class);
-            if (connectionProperty != null) {
-                return connectionProperty.getClient();
-            }
+            if (connectionProperty != null) return connectionProperty.getClient();
         }
         return null;
     }
@@ -109,13 +109,15 @@ public boolean isApplicable(Class<? extends Job> jobType) {
 
         @Override
         public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+            assert req != null;
             return req.bindJSON(GitLabConnectionProperty.class, formData);
         }
 
         public ListBoxModel doFillGitLabConnectionItems() {
             ListBoxModel options = new ListBoxModel();
             GitLabConnectionConfig descriptor =
-                    (GitLabConnectionConfig) Jenkins.getInstance().getDescriptor(GitLabConnectionConfig.class);
+                    (GitLabConnectionConfig) Objects.requireNonNull(Jenkins.getInstance()).getDescriptor(GitLabConnectionConfig.class);
+            assert descriptor != null;
             for (GitLabConnection connection : descriptor.getConnections()) {
                 options.add(connection.getName(), connection.getName());
             }
@@ -154,7 +156,8 @@ public FormValidation doTestConnection(
             try {
                 GitLabConnection gitLabConnectionTested = null;
                 GitLabConnectionConfig descriptor =
-                        (GitLabConnectionConfig) Jenkins.getInstance().getDescriptor(GitLabConnectionConfig.class);
+                        (GitLabConnectionConfig) Objects.requireNonNull(Jenkins.getInstance()).getDescriptor(GitLabConnectionConfig.class);
+                assert descriptor != null;
                 for (GitLabConnection connection : descriptor.getConnections()) {
                     if (gitLabConnection.equals(connection.getName())) {
                         gitLabConnectionTested = connection;

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/GitLabClientBuilder.java b/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/GitLabClientBuilder.java
@@ -8,6 +8,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
+
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -26,7 +28,7 @@ public static GitLabClientBuilder getGitLabClientBuilderById(String id) {
 
     public static List<GitLabClientBuilder> getAllGitLabClientBuilders() {
         List<GitLabClientBuilder> builders =
-                new ArrayList<>(Jenkins.getInstance().getExtensionList(GitLabClientBuilder.class));
+                new ArrayList<>(Objects.requireNonNull(Jenkins.getInstance()).getExtensionList(GitLabClientBuilder.class));
         sort(builders);
         return builders;
     }

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/publisher/GitLabMessagePublisher.java b/src/main/java/com/dabsquared/gitlabjenkins/publisher/GitLabMessagePublisher.java
@@ -13,6 +13,7 @@
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ws.rs.ProcessingException;
@@ -245,11 +246,11 @@ private String getNote(Run<?, ?> build, TaskListener listener) {
             message = replaceMacros(build, listener, this.getFailureNoteText());
         } else {
             String icon = getResultIcon(build.getResult());
-            String buildUrl = Jenkins.getInstance().getRootUrl() + build.getUrl();
+            String buildUrl = Objects.requireNonNull(Jenkins.getInstance()).getRootUrl() + build.getUrl();
             message = MessageFormat.format(
                     "{0} Jenkins Build {1}\n\nResults available at: [Jenkins [{2} #{3}]]({4})",
                     icon,
-                    build.getResult().toString(),
+                    Objects.requireNonNull(build.getResult()).toString(),
                     build.getParent().getDisplayName(),
                     build.getNumber(),
                     buildUrl);

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/trigger/branch/ProjectBranchesProvider.java b/src/main/java/com/dabsquared/gitlabjenkins/trigger/branch/ProjectBranchesProvider.java
@@ -115,7 +115,7 @@ private boolean containsNoBranches(@QueryParameter String value) {
     private String[] getProjectBranchesAsArray(Job<?, ?> job) {
         try {
             List<String> branches = getProjectBranches(job);
-            return branches.toArray(new String[branches.size()]);
+            return branches.toArray(new String[0]);
         } catch (GitLabProjectBranchesService.BranchLoadingException e) {
             LOGGER.log(
                     Level.FINEST,

diff --git a/...main/java/com/dabsquared/gitlabjenkins/trigger/handler/AbstractWebHookTriggerHandler.java b/...main/java/com/dabsquared/gitlabjenkins/trigger/handler/AbstractWebHookTriggerHandler.java
@@ -111,7 +111,7 @@ protected Action[] createActions(Job<?, ?> job, H hook) {
                     "unknown handled situation, dont know what revision to build for req {0} for job {1}",
                     new Object[] {hook, (job != null ? job.getFullName() : null)});
         }
-        return actions.toArray(new Action[actions.size()]);
+        return actions.toArray(new Action[0]);
     }
 
     protected void cancelPendingBuildsIfNecessary(Job<?, ?> job, H hook) {}

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandler.java b/src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandler.java
@@ -12,6 +12,8 @@
 import hudson.model.Cause;
 import hudson.model.Job;
 import hudson.model.Queue;
+
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
@@ -24,7 +26,7 @@ public class PendingBuildsHandler {
     private static final Logger LOGGER = Logger.getLogger(PendingBuildsHandler.class.getName());
 
     public void cancelPendingBuilds(Job<?, ?> job, Integer projectId, String branch) {
-        Queue queue = Jenkins.getInstance().getQueue();
+        Queue queue = Objects.requireNonNull(Jenkins.getInstance()).getQueue();
         for (Queue.Item item : queue.getItems()) {
             if (!job.getName().equals(item.task.getName())) {
                 continue;

diff --git a/...com/dabsquared/gitlabjenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java b/...com/dabsquared/gitlabjenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java
@@ -132,7 +132,7 @@ protected CauseData retrieveCauseData(PipelineHook hook) {
                                 ? ""
                                 : hook.getRepository().getGitSshUrl())
                 .withSourceRepoHttpUrl(
-                        hook.getRepository() == null || hook.getRepository() == null
+                        hook.getRepository() == null
                                 ? ""
                                 : hook.getRepository().getGitHttpUrl())
                 .withMergeRequestTitle("")

diff --git a/...dabsquared/gitlabjenkins/trigger/handler/push/OpenMergeRequestPushHookTriggerHandler.java b/...dabsquared/gitlabjenkins/trigger/handler/push/OpenMergeRequestPushHookTriggerHandler.java
@@ -146,7 +146,7 @@ private void handleMergeRequest(
             List<Action> actions = Arrays.<Action>asList(
                     new CauseAction(new GitLabWebHookCause(retrieveCauseData(hook, project, mergeRequest, branch))),
                     new RevisionParameterAction(commit, retrieveUrIish(hook)));
-            scheduleBuild(job, actions.toArray(new Action[actions.size()]));
+            scheduleBuild(job, actions.toArray(new Action[0]));
         }
     }
 

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/trigger/label/ProjectLabelsProvider.java b/src/main/java/com/dabsquared/gitlabjenkins/trigger/label/ProjectLabelsProvider.java
@@ -113,7 +113,7 @@ private boolean containsNoLabel(@QueryParameter String value) {
     private String[] getProjectLabelsAsArray(Job<?, ?> job) {
         try {
             List<String> labels = getProjectLabels(job);
-            return labels.toArray(new String[labels.size()]);
+            return labels.toArray(new String[0]);
         } catch (GitLabProjectLabelsService.LabelLoadingException e) {
             LOGGER.log(
                     Level.FINEST,

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/webhook/build/BuildWebHookAction.java b/src/main/java/com/dabsquared/gitlabjenkins/webhook/build/BuildWebHookAction.java
@@ -11,6 +11,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Objects;
 import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
@@ -88,7 +89,7 @@ public void run() {
         }
 
         private void checkPermission(Permission permission, Item project) {
-            if (((GitLabConnectionConfig) Jenkins.get().getDescriptor(GitLabConnectionConfig.class))
+            if (((GitLabConnectionConfig) Objects.requireNonNull(Jenkins.get().getDescriptor(GitLabConnectionConfig.class)))
                     .isUseAuthenticatedEndpoint()) {
                 if (!project.getACL().hasPermission(authentication, permission)) {
                     String message = String.format(

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/webhook/status/BuildPageRedirectAction.java b/src/main/java/com/dabsquared/gitlabjenkins/webhook/status/BuildPageRedirectAction.java
@@ -4,6 +4,8 @@
 import hudson.model.Run;
 import hudson.util.HttpResponses;
 import java.io.IOException;
+import java.util.Objects;
+
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.StaplerResponse;
 
@@ -21,7 +23,7 @@ protected BuildPageRedirectAction(Run<?, ?> build) {
     public void execute(StaplerResponse response) {
         if (build != null) {
             try {
-                response.sendRedirect2(Jenkins.getInstance().getRootUrl() + build.getUrl());
+                response.sendRedirect2(Objects.requireNonNull(Jenkins.getInstance()).getRootUrl() + build.getUrl());
             } catch (IOException e) {
                 try {
                     response.sendRedirect2(Jenkins.getInstance().getRootUrl() + build.getBuildStatusUrl());

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/workflow/GitLabCommitStatusStep.java b/src/main/java/com/dabsquared/gitlabjenkins/workflow/GitLabCommitStatusStep.java
@@ -132,6 +132,7 @@ public void onFailure(StepContext context, Throwable t) {
 
                             CommitStatusUpdater.updateCommitStatus(
                                     run, getTaskListener(context), state, name, step.builds, step.connection);
+                            assert t != null;
                             context.onFailure(t);
                         }
                     })