Merge pull request #767 from res0nance/annotate

[JENKINS-59540] Add annotation to getUrl

Author: MarkEWaite

src/main/java/hudson/plugins/git/UserRemoteConfig.java

@@ -68,6 +68,7 @@ public String getRefspec() {
     }
 
     @Exported
+    @CheckForNull
     public String getUrl() {
         return url;
     }

src/main/java/jenkins/plugins/git/GitSCMFileSystem.java

@@ -282,11 +282,15 @@ public SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, @CheckForNull
             if (rev != null && !(rev instanceof AbstractGitSCMSource.SCMRevisionImpl)) {
                 return null;
             }
-            TaskListener listener = new LogTaskListener(LOGGER, Level.FINE);
             GitSCM gitSCM = (GitSCM) scm;
             UserRemoteConfig config = gitSCM.getUserRemoteConfigs().get(0);
             BranchSpec branchSpec = gitSCM.getBranches().get(0);
             String remote = config.getUrl();
+            TaskListener listener = new LogTaskListener(LOGGER, Level.FINE);
+            if (remote == null) {
+                listener.getLogger().println("Git remote url is null");
+                return null;
+            }
             String cacheEntry = AbstractGitSCMSource.getCacheEntry(remote);
             Lock cacheLock = AbstractGitSCMSource.getCacheLock(cacheEntry);
             cacheLock.lock();

src/main/java/jenkins/plugins/git/GitSCMTelescope.java

@@ -137,10 +137,13 @@ public final boolean supports(@NonNull SCM source) {
             GitSCM git = (GitSCM) source;
             List<UserRemoteConfig> configs = git.getUserRemoteConfigs();
             List<BranchSpec> branches = git.getBranches();
-            return configs.size() == 1
-                    && supports(configs.get(0).getUrl())
+            if (configs.size() == 1) {
+                String remote = configs.get(0).getUrl();
+                return remote != null
+                    && supports(remote)
                     && branches.size() == 1
                     && !branches.get(0).getName().contains("*");
+            }
         }
         return false;
     }
@@ -183,48 +186,50 @@ public final SCMFileSystem build(@NonNull Item owner, @NonNull SCM scm, SCMRevis
             GitSCM git = (GitSCM) scm;
             List<UserRemoteConfig> configs = git.getUserRemoteConfigs();
             List<BranchSpec> branches = git.getBranches();
-            if (configs.size() == 1 && supports(configs.get(0).getUrl())
-                    && branches.size() == 1 && !branches.get(0).getName().contains("*")) {
+            if (configs.size() == 1) {
                 UserRemoteConfig config = configs.get(0);
-                StandardCredentials credentials;
-                String credentialsId = config.getCredentialsId();
                 String remote = config.getUrl();
-                if (credentialsId != null) {
-                    List<StandardUsernameCredentials> urlCredentials = CredentialsProvider
-                            .lookupCredentials(StandardUsernameCredentials.class, owner,
-                                    owner instanceof Queue.Task
-                                            ? Tasks.getAuthenticationOf((Queue.Task) owner)
-                                            : ACL.SYSTEM, URIRequirementBuilder.fromUri(remote).build());
-                    credentials = CredentialsMatchers.firstOrNull(
-                            urlCredentials,
-                            CredentialsMatchers
-                                    .allOf(CredentialsMatchers.withId(credentialsId), GitClient.CREDENTIALS_MATCHER)
-                    );
-                } else {
-                    credentials = null;
-                }
-                validate(remote, credentials);
-                SCMHead head;
-                if (rev == null) {
-                    String name = branches.get(0).getName();
-                    if (name.startsWith(Constants.R_TAGS)) {
-                        head = new GitTagSCMHead(
-                                name.substring(Constants.R_TAGS.length()),
-                                getTimestamp(remote, credentials, name)
+                if (remote != null && supports(remote)
+                    && branches.size() == 1 && !branches.get(0).getName().contains("*")) {
+                    StandardCredentials credentials;
+                    String credentialsId = config.getCredentialsId();
+                    if (credentialsId != null) {
+                        List<StandardUsernameCredentials> urlCredentials = CredentialsProvider
+                                .lookupCredentials(StandardUsernameCredentials.class, owner,
+                                        owner instanceof Queue.Task
+                                                ? Tasks.getAuthenticationOf((Queue.Task) owner)
+                                                : ACL.SYSTEM, URIRequirementBuilder.fromUri(remote).build());
+                        credentials = CredentialsMatchers.firstOrNull(
+                                urlCredentials,
+                                CredentialsMatchers
+                                        .allOf(CredentialsMatchers.withId(credentialsId), GitClient.CREDENTIALS_MATCHER)
                         );
-                    } else if (name.startsWith(Constants.R_HEADS)) {
-                        head = new GitBranchSCMHead(name.substring(Constants.R_HEADS.length()));
                     } else {
-                        if (name.startsWith(config.getName() + "/")) {
-                            head = new GitBranchSCMHead(name.substring(config.getName().length() + 1));
+                        credentials = null;
+                    }
+                    validate(remote, credentials);
+                    SCMHead head;
+                    if (rev == null) {
+                        String name = branches.get(0).getName();
+                        if (name.startsWith(Constants.R_TAGS)) {
+                            head = new GitTagSCMHead(
+                                    name.substring(Constants.R_TAGS.length()),
+                                    getTimestamp(remote, credentials, name)
+                            );
+                        } else if (name.startsWith(Constants.R_HEADS)) {
+                            head = new GitBranchSCMHead(name.substring(Constants.R_HEADS.length()));
                         } else {
-                            head = new GitBranchSCMHead(name);
+                            if (name.startsWith(config.getName() + "/")) {
+                                head = new GitBranchSCMHead(name.substring(config.getName().length() + 1));
+                            } else {
+                                head = new GitBranchSCMHead(name);
+                            }
                         }
+                    } else {
+                        head = rev.getHead();
                     }
-                } else {
-                    head = rev.getHead();
+                    return build(remote, credentials, head, rev);
                 }
-                return build(remote, credentials, head, rev);
             }
         }
         return null;