From 502e2afd06eb571b2637f11fb76d738c79064841 Mon Sep 17 00:00:00 2001
From: Alex Goodman <alex.goodman@anchore.com>
Date: Fri, 10 Jul 2020 07:45:13 -0400
Subject: [PATCH] fix linting issue

---
 imgbom/cataloger/java/java_manifest.go      | 70 +++++++++++----------
 imgbom/cataloger/java/java_manifest_test.go |  2 +-
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/imgbom/cataloger/java/java_manifest.go b/imgbom/cataloger/java/java_manifest.go
index 1e216dd08..09979f0cf 100644
--- a/imgbom/cataloger/java/java_manifest.go
+++ b/imgbom/cataloger/java/java_manifest.go
@@ -66,6 +66,42 @@ func parseJavaManifest(reader io.Reader) (*pkg.JavaManifest, error) {
 	return &manifest, nil
 }
 
+func selectName(manifest *pkg.JavaManifest, filenameObj archiveFilename) string {
+	var name string
+	switch {
+	case filenameObj.name() != "":
+		name = filenameObj.name()
+	case manifest.Name != "":
+		// Manifest original spec...
+		name = manifest.Name
+	case manifest.Extra["Bundle-Name"] != "":
+		// BND tooling...
+		name = manifest.Extra["Bundle-Name"]
+	case manifest.Extra["Short-Name"] != "":
+		// Jenkins...
+		name = manifest.Extra["Short-Name"]
+	case manifest.Extra["Extension-Name"] != "":
+		// Jenkins...
+		name = manifest.Extra["Extension-Name"]
+	}
+	return name
+}
+
+func selectVersion(manifest *pkg.JavaManifest, filenameObj archiveFilename) string {
+	var version string
+	switch {
+	case manifest.ImplVersion != "":
+		version = manifest.ImplVersion
+	case filenameObj.version() != "":
+		version = filenameObj.version()
+	case manifest.SpecVersion != "":
+		version = manifest.SpecVersion
+	case manifest.Extra["Plugin-Version"] != "":
+		version = manifest.Extra["Plugin-Version"]
+	}
+	return version
+}
+
 func newPackageFromJavaManifest(virtualPath, archivePath string, fileManifest file.ZipManifest) (*pkg.Package, error) {
 	// search and parse java manifest files
 	manifestMatches := fileManifest.GlobMatch(manifestPath)
@@ -91,39 +127,9 @@ func newPackageFromJavaManifest(virtualPath, archivePath string, fileManifest fi
 
 	filenameObj := newJavaArchiveFilename(virtualPath)
 
-	var name string
-	switch {
-	case filenameObj.name() != "":
-		name = filenameObj.name()
-	case manifest.Name != "":
-		// Manifest original spec...
-		name = manifest.Name
-	case manifest.Extra["Bundle-Name"] != "":
-		// BND tooling...
-		name = manifest.Extra["Bundle-Name"]
-	case manifest.Extra["Short-Name"] != "":
-		// Jenkins...
-		name = manifest.Extra["Short-Name"]
-	case manifest.Extra["Extension-Name"] != "":
-		// Jenkins...
-		name = manifest.Extra["Extension-Name"]
-	}
-
-	var version string
-	switch {
-	case manifest.ImplVersion != "":
-		version = manifest.ImplVersion
-	case filenameObj.version() != "":
-		version = filenameObj.version()
-	case manifest.SpecVersion != "":
-		version = manifest.SpecVersion
-	case manifest.Extra["Plugin-Version"] != "":
-		name = manifest.Extra["Plugin-Version"]
-	}
-
 	return &pkg.Package{
-		Name:     name,
-		Version:  version,
+		Name:     selectName(manifest, filenameObj),
+		Version:  selectVersion(manifest, filenameObj),
 		Language: pkg.Java,
 		Metadata: pkg.JavaMetadata{
 			Manifest: manifest,
diff --git a/imgbom/cataloger/java/java_manifest_test.go b/imgbom/cataloger/java/java_manifest_test.go
index 71cfce3d4..ec5e97cc5 100644
--- a/imgbom/cataloger/java/java_manifest_test.go
+++ b/imgbom/cataloger/java/java_manifest_test.go
@@ -58,7 +58,7 @@ func TestParseJavaManifest(t *testing.T) {
 			fixture: "test-fixtures/manifest/version-with-date",
 			expected: pkg.JavaManifest{
 				ManifestVersion: "1.0",
-				ImplVersion: "1.3", // ensure the date is stripped off during processing
+				ImplVersion:     "1.3", // ensure the date is stripped off during processing
 			},
 		},
 	}