1 files changed, 6 insertions, 66 deletions
diff --git a/app/finders/packages/maven/package_finder.rb b/app/finders/packages/maven/package_finder.rb
index eefcdaba3c8..cc28d951f52 100644
--- a/app/finders/packages/maven/package_finder.rb
+++ b/app/finders/packages/maven/package_finder.rb
@@ -2,83 +2,23 @@
 
 module Packages
   module Maven
-    class PackageFinder
-      include ::Packages::FinderHelper
-      include Gitlab::Utils::StrongMemoize
-
-      def initialize(path, current_user, project: nil, group: nil, order_by_package_file: false)
-        @path = path
-        @current_user = current_user
-        @project = project
-        @group = group
-        @order_by_package_file = order_by_package_file
-      end
-
+    class PackageFinder < ::Packages::GroupOrProjectPackageFinder
       def execute
-        packages_with_path.last
+        packages.last
       end
 
       def execute!
-        packages_with_path.last!
+        packages.last!
       end
 
       private
 
-      def base
-        if @project
-          packages_for_a_single_project
-        elsif @group
-          packages_for_multiple_projects
-        else
-          ::Packages::Package.none
-        end
-      end
-
-      def packages_with_path
-        matching_packages = base.only_maven_packages_with_path(@path, use_cte: @group.present?)
-
-        if group_level_improvements?
-          matching_packages = matching_packages.order_by_package_file if @order_by_package_file
-        else
-          matching_packages = matching_packages.order_by_package_file if versionless_package?(matching_packages)
-        end
+      def packages
+        matching_packages = base.only_maven_packages_with_path(@params[:path], use_cte: group?)
+        matching_packages = matching_packages.order_by_package_file if @params[:order_by_package_file]
 
         matching_packages
       end
-
-      def versionless_package?(matching_packages)
-        return if matching_packages.empty?
-
-        # if one matching package is versionless, they all are.
-        matching_packages.first&.version.nil?
-      end
-
-      # Produces a query that retrieves packages from a single project.
-      def packages_for_a_single_project
-        @project.packages
-      end
-
-      # Produces a query that retrieves packages from multiple projects that
-      # the current user can view within a group.
-      def packages_for_multiple_projects
-        if group_level_improvements?
-          packages_visible_to_user(@current_user, within_group: @group)
-        else
-          ::Packages::Package.for_projects(projects_visible_to_current_user)
-        end
-      end
-
-      # Returns the projects that the current user can view within a group.
-      def projects_visible_to_current_user
-        @group.all_projects
-              .public_or_visible_to_user(@current_user)
-      end
-
-      def group_level_improvements?
-        strong_memoize(:group_level_improvements) do
-          Feature.enabled?(:maven_packages_group_level_improvements, default_enabled: :yaml)
-        end
-      end
     end
   end
 end