resolve issues identified by SpotBugs

blasted null checks are ugly but oh well
jenkinsci · Aug 31, 2023 · b4bde02 · b4bde02
1 parent c772bc0
commit b4bde02
Showing 1 changed file with 36 additions and 32 deletions.
diff --git a/src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/RecorderAction.java b/src/main/java/org/jvnet/hudson/plugins/repositoryconnector/aether/RecorderAction.java
@@ -85,22 +85,24 @@ public Artifact(RepositoryEvent event, RepositoryLayout repositoryLayout) {
                 try {
                     // getLocation returns a URI instance that ONLY has a path (no scheme, host, ...)
                     URI downloadLocation = repositoryLayout.getLocation(artifact, false);
-                    downloadPath = downloadLocation.getPath();
-                    if (downloadPath == null) {
-                        downloadPath = "";
-                    } else {
-                        downloadFileName = Paths.get(downloadPath).getFileName().toString();
-
-                        URI repoUri = new URI(((RemoteRepository) repository).getUrl());
-                        downloadUrl = new URI(
-                            repoUri.getScheme(),
-                            null, // drop any userInfo (user:password)
-                            repoUri.getHost(),
-                            repoUri.getPort(),
-                            repoUri.resolve(downloadLocation).getPath(),
-                            repoUri.getQuery(),
-                            repoUri.getFragment()
-                        ).toString();
+                    if (downloadLocation != null) {
+                        downloadPath = downloadLocation.getPath();
+                        if (downloadPath == null) {
+                            downloadPath = "";
+                        } else {
+                            downloadFileName = Paths.get(downloadPath).getFileName().toString();
+
+                            URI repoUri = new URI(((RemoteRepository) repository).getUrl());
+                            downloadUrl = new URI(
+                                repoUri.getScheme(),
+                                null, // drop any userInfo (user:password)
+                                repoUri.getHost(),
+                                repoUri.getPort(),
+                                repoUri.resolve(downloadLocation).getPath(),
+                                repoUri.getQuery(),
+                                repoUri.getFragment()
+                            ).toString();
+                        }
                     }
                 } catch (URISyntaxException ignored) {
                 }
@@ -213,22 +215,24 @@ public Metadata(RepositoryEvent event, RepositoryLayout repositoryLayout) {
                 try {
                     // getLocation returns a URI instance that ONLY has a path (no scheme, host, ...)
                     URI downloadLocation = repositoryLayout.getLocation(metadata, false);
-                    downloadPath = downloadLocation.getPath();
-                    if (downloadPath == null) {
-                        downloadPath = "";
-                    } else {
-                        downloadFileName = Paths.get(downloadPath).getFileName().toString();
-
-                        URI repoUri = new URI(((RemoteRepository) repository).getUrl());
-                        downloadUrl = new URI(
-                            repoUri.getScheme(),
-                            null, // drop any userInfo (user:password)
-                            repoUri.getHost(),
-                            repoUri.getPort(),
-                            repoUri.resolve(downloadLocation).getPath(),
-                            repoUri.getQuery(),
-                            repoUri.getFragment()
-                        ).toString();
+                    if (downloadLocation != null) {
+                        downloadPath = downloadLocation.getPath();
+                        if (downloadPath == null) {
+                            downloadPath = "";
+                        } else {
+                            downloadFileName = Paths.get(downloadPath).getFileName().toString();
+
+                            URI repoUri = new URI(((RemoteRepository) repository).getUrl());
+                            downloadUrl = new URI(
+                                repoUri.getScheme(),
+                                null, // drop any userInfo (user:password)
+                                repoUri.getHost(),
+                                repoUri.getPort(),
+                                repoUri.resolve(downloadLocation).getPath(),
+                                repoUri.getQuery(),
+                                repoUri.getFragment()
+                            ).toString();
+                        }
                     }
                 } catch (URISyntaxException ignored) {
                 }