Simplify logic

paketo-buildpacks · Jul 17, 2024 · e2e9876 · e2e9876
1 parent dd0d02f
commit e2e9876
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/executable/detect.go b/executable/detect.go
@@ -21,7 +21,6 @@ import (
 	"reflect"
 
 	"github.com/buildpacks/libcnb"
-	"github.com/paketo-buildpacks/libjvm"
 	"github.com/paketo-buildpacks/libpak"
 	"github.com/paketo-buildpacks/libpak/bard"
 )
@@ -61,25 +60,15 @@ func (d Detect) Detect(context libcnb.DetectContext) (libcnb.DetectResult, error
 		},
 	}
 
-	m, err := libjvm.NewManifest(context.Application.Path)
+	jarGlob, _ := cr.Resolve("BP_EXECUTABLE_JAR_LOCATION")
+	execJar, err := LoadExecutableJAR(context.Application.Path, jarGlob)
 	if err != nil {
-		return libcnb.DetectResult{}, fmt.Errorf("unable to read manifest in %s\n%w", context.Application.Path, err)
+		return libcnb.DetectResult{}, fmt.Errorf("unable to load executable JAR\n%w", err)
 	}
 
-	if _, ok := m.Get("Main-Class"); ok {
+	if !reflect.DeepEqual(execJar, ExecutableJAR{}) {
 		d.Logger.Info("PASSED: 'Main-Class' manifest attribute found")
 		result.Plans[0].Provides = append(result.Plans[0].Provides, libcnb.BuildPlanProvide{Name: PlanEntryJVMApplicationPackage})
-	} else {
-		jarGlob, _ := cr.Resolve("BP_EXECUTABLE_JAR_LOCATION")
-		execJar, err := LoadExecutableJAR(context.Application.Path, jarGlob)
-		if err != nil {
-			return libcnb.DetectResult{}, fmt.Errorf("unable to load executable JAR\n%w", err)
-		}
-
-		if !reflect.DeepEqual(execJar, ExecutableJAR{}) {
-			d.Logger.Info("PASSED: 'Main-Class' manifest attribute found")
-			result.Plans[0].Provides = append(result.Plans[0].Provides, libcnb.BuildPlanProvide{Name: PlanEntryJVMApplicationPackage})
-		}
 	}
 
 	if cr.ResolveBool("BP_LIVE_RELOAD_ENABLED") {