From 61ccd84416e8b79a8011b5f13e2d32512bad6cea Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Thu, 28 Apr 2022 17:49:01 +0200
Subject: [PATCH] Fix RuboCop offenses for Lint/UselessMethodDefinition

This commit also disables some offenses:
* We need to re-expose some Rails' internal method `status` as action
* Limit amount of passed parameters
---
 .rubocop_todo.yml                                     | 6 ------
 app/controllers/import/bitbucket_controller.rb        | 7 +++----
 app/controllers/import/bitbucket_server_controller.rb | 7 +++----
 app/controllers/import/fogbugz_controller.rb          | 4 ----
 app/controllers/import/gitea_controller.rb            | 4 +++-
 app/controllers/import/gitlab_controller.rb           | 3 +++
 app/controllers/import/manifest_controller.rb         | 7 +++----
 app/finders/tags_finder.rb                            | 4 ----
 app/services/merge_requests/create_service.rb         | 4 +---
 ee/app/models/ee/project.rb                           | 5 -----
 ee/app/services/boards/epic_lists/create_service.rb   | 6 ------
 ee/lib/analytics/refresh_approvals_data.rb            | 2 ++
 ee/lib/analytics/refresh_reassign_data.rb             | 2 ++
 lib/bitbucket/representation/repo.rb                  | 4 ----
 lib/bitbucket_server/representation/repo.rb           | 4 ----
 lib/gitlab/ci/pipeline/expression/lexeme/string.rb    | 4 ----
 lib/gitlab/config/entry/validator.rb                  | 4 ----
 lib/gitlab/git/branch.rb                              | 4 ----
 lib/gitlab/reactive_cache_set_cache.rb                | 4 ----
 lib/gitlab/snippet_search_results.rb                  | 4 ----
 qa/qa/resource/group_deploy_token.rb                  | 4 ----
 qa/qa/resource/project_access_token.rb                | 4 ----
 qa/qa/resource/project_deploy_token.rb                | 4 ----
 23 files changed, 20 insertions(+), 81 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b3207c1923fc5a..95342a371db778 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -11,12 +11,6 @@ Gitlab/PolicyRuleBoolean:
   Exclude:
     - 'ee/app/policies/ee/identity_provider_policy.rb'
 
-# Offense count: 22
-# Cop supports --auto-correct.
-# Configuration parameters: AllowComments.
-Lint/UselessMethodDefinition:
-  Enabled: false
-
 # Offense count: 218
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredName.
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index 7c9525d1744663..55707000cf806b 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -29,13 +29,12 @@ def callback
     end
   end
 
+  # We need to re-expose controller's internal method 'status' as action.
+  # rubocop:disable Lint/UselessMethodDefinition
   def status
     super
   end
-
-  def realtime_changes
-    super
-  end
+  # rubocop:enable Lint/UselessMethodDefinition
 
   def create
     bitbucket_client = Bitbucket::Client.new(credentials)
diff --git a/app/controllers/import/bitbucket_server_controller.rb b/app/controllers/import/bitbucket_server_controller.rb
index 31e9694ca1db3d..00f3f0b08b2e47 100644
--- a/app/controllers/import/bitbucket_server_controller.rb
+++ b/app/controllers/import/bitbucket_server_controller.rb
@@ -52,13 +52,12 @@ def configure
     redirect_to status_import_bitbucket_server_path
   end
 
+  # We need to re-expose controller's internal method 'status' as action.
+  # rubocop:disable Lint/UselessMethodDefinition
   def status
     super
   end
-
-  def realtime_changes
-    super
-  end
+  # rubocop:enable Lint/UselessMethodDefinition
 
   protected
 
diff --git a/app/controllers/import/fogbugz_controller.rb b/app/controllers/import/fogbugz_controller.rb
index 377292d47d8ab9..c223d9d211e578 100644
--- a/app/controllers/import/fogbugz_controller.rb
+++ b/app/controllers/import/fogbugz_controller.rb
@@ -54,10 +54,6 @@ def status
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
-  def realtime_changes
-    super
-  end
-
   def create
     repo = client.repo(params[:repo_id])
     fb_session = { uri: session[:fogbugz_uri], token: session[:fogbugz_token] }
diff --git a/app/controllers/import/gitea_controller.rb b/app/controllers/import/gitea_controller.rb
index a1a9f4112f2aa2..4b4ac07b38972c 100644
--- a/app/controllers/import/gitea_controller.rb
+++ b/app/controllers/import/gitea_controller.rb
@@ -16,10 +16,12 @@ def personal_access_token
     super
   end
 
-  # Must be defined or it will 404
+  # We need to re-expose controller's internal method 'status' as action.
+  # rubocop:disable Lint/UselessMethodDefinition
   def status
     super
   end
+  # rubocop:enable Lint/UselessMethodDefinition
 
   protected
 
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index fa9517c35458c8..c846d9d225aac2 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -16,9 +16,12 @@ def callback
     redirect_to status_import_gitlab_url
   end
 
+  # We need to re-expose controller's internal method 'status' as action.
+  # rubocop:disable Lint/UselessMethodDefinition
   def status
     super
   end
+  # rubocop:enable Lint/UselessMethodDefinition
 
   def create
     repo = client.project(params[:repo_id].to_i)
diff --git a/app/controllers/import/manifest_controller.rb b/app/controllers/import/manifest_controller.rb
index 956d0c9a2ae6ab..461ba982969521 100644
--- a/app/controllers/import/manifest_controller.rb
+++ b/app/controllers/import/manifest_controller.rb
@@ -10,9 +10,12 @@ class Import::ManifestController < Import::BaseController
   def new
   end
 
+  # We need to re-expose controller's internal method 'status' as action.
+  # rubocop:disable Lint/UselessMethodDefinition
   def status
     super
   end
+  # rubocop:enable Lint/UselessMethodDefinition
 
   def upload
     group = Group.find(params[:group_id])
@@ -36,10 +39,6 @@ def upload
     end
   end
 
-  def realtime_changes
-    super
-  end
-
   def create
     repository = importable_repos.find do |project|
       project[:id] == params[:repo_id].to_i
diff --git a/app/finders/tags_finder.rb b/app/finders/tags_finder.rb
index 6bc5419e704ed2..16bba62f76620f 100644
--- a/app/finders/tags_finder.rb
+++ b/app/finders/tags_finder.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 class TagsFinder < GitRefsFinder
-  def initialize(repository, params)
-    super(repository, params)
-  end
-
   def execute(gitaly_pagination: false)
     tags = if gitaly_pagination
              repository.tags_sorted_by(sort, pagination_params)
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb
index 9c525ae8489784..8e0f72eb380872 100644
--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
@@ -25,9 +25,7 @@ def after_create(issuable)
 
     # expose issuable create method so it can be called from email
     # handler CreateMergeRequestHandler
-    def create(merge_request)
-      super
-    end
+    public :create
 
     private
 
diff --git a/ee/app/models/ee/project.rb b/ee/app/models/ee/project.rb
index af55acc1ea0a17..6f8418dc56bcdb 100644
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -632,11 +632,6 @@ def remove_import_data
       super unless mirror?
     end
 
-    def merge_requests_ff_only_enabled
-      super
-    end
-    alias_method :merge_requests_ff_only_enabled?, :merge_requests_ff_only_enabled
-
     override :disabled_integrations
     def disabled_integrations
       strong_memoize(:disabled_integrations) do
diff --git a/ee/app/services/boards/epic_lists/create_service.rb b/ee/app/services/boards/epic_lists/create_service.rb
index e0935c5946c830..6ec39bb62cec06 100644
--- a/ee/app/services/boards/epic_lists/create_service.rb
+++ b/ee/app/services/boards/epic_lists/create_service.rb
@@ -3,12 +3,6 @@
 module Boards
   module EpicLists
     class CreateService < ::Boards::Lists::BaseCreateService
-      extend ::Gitlab::Utils::Override
-
-      override :execute
-      def execute(board)
-        super
-      end
     end
   end
 end
diff --git a/ee/lib/analytics/refresh_approvals_data.rb b/ee/lib/analytics/refresh_approvals_data.rb
index dc4320e72b085d..59402e516afcb8 100644
--- a/ee/lib/analytics/refresh_approvals_data.rb
+++ b/ee/lib/analytics/refresh_approvals_data.rb
@@ -5,9 +5,11 @@ class RefreshApprovalsData
     include MergeRequestMetricsRefresh
 
     # Override `MergeRequestMetricsRefresh#initialize` to accept single MR only
+    # rubocop:disable Lint/UselessMethodDefinition
     def initialize(merge_request)
       super
     end
+    # rubocop:enable Lint/UselessMethodDefinition
 
     private
 
diff --git a/ee/lib/analytics/refresh_reassign_data.rb b/ee/lib/analytics/refresh_reassign_data.rb
index 8c6d5589d5a34a..7a2fc029f01c5d 100644
--- a/ee/lib/analytics/refresh_reassign_data.rb
+++ b/ee/lib/analytics/refresh_reassign_data.rb
@@ -5,9 +5,11 @@ class RefreshReassignData
     include MergeRequestMetricsRefresh
 
     # Override `MergeRequestMetricsRefresh#initialize` to accept single MR only
+    # rubocop:disable Lint/UselessMethodDefinition
     def initialize(merge_request)
       super
     end
+    # rubocop:enable Lint/UselessMethodDefinition
 
     private
 
diff --git a/lib/bitbucket/representation/repo.rb b/lib/bitbucket/representation/repo.rb
index fa4780dd8def01..8d5b15e299af8b 100644
--- a/lib/bitbucket/representation/repo.rb
+++ b/lib/bitbucket/representation/repo.rb
@@ -3,10 +3,6 @@
 module Bitbucket
   module Representation
     class Repo < Representation::Base
-      def initialize(raw)
-        super(raw)
-      end
-
       def owner_and_slug
         @owner_and_slug ||= full_name.split('/', 2)
       end
diff --git a/lib/bitbucket_server/representation/repo.rb b/lib/bitbucket_server/representation/repo.rb
index 4cd5b75bbed7ce..a3c5f38794130b 100644
--- a/lib/bitbucket_server/representation/repo.rb
+++ b/lib/bitbucket_server/representation/repo.rb
@@ -3,10 +3,6 @@
 module BitbucketServer
   module Representation
     class Repo < Representation::Base
-      def initialize(raw)
-        super(raw)
-      end
-
       def project_key
         raw.dig('project', 'key')
       end
diff --git a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
index e90e764bcd9a94..798cea34db61cf 100644
--- a/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
+++ b/lib/gitlab/ci/pipeline/expression/lexeme/string.rb
@@ -8,10 +8,6 @@ module Lexeme
           class String < Lexeme::Value
             PATTERN = /("(?<string>.*?)")|('(?<string>.*?)')/.freeze
 
-            def initialize(value)
-              super(value)
-            end
-
             def evaluate(variables = {})
               @value.to_s
             end
diff --git a/lib/gitlab/config/entry/validator.rb b/lib/gitlab/config/entry/validator.rb
index e5efd4a7b0a4d8..297645a65c19c4 100644
--- a/lib/gitlab/config/entry/validator.rb
+++ b/lib/gitlab/config/entry/validator.rb
@@ -7,10 +7,6 @@ class Validator < SimpleDelegator
         include ActiveModel::Validations
         include Entry::Validators
 
-        def initialize(entry)
-          super(entry)
-        end
-
         def messages
           errors.full_messages.map do |error|
             "#{location} #{error}".downcase
diff --git a/lib/gitlab/git/branch.rb b/lib/gitlab/git/branch.rb
index fbe52db9c0b9fd..9637f8756b1730 100644
--- a/lib/gitlab/git/branch.rb
+++ b/lib/gitlab/git/branch.rb
@@ -13,10 +13,6 @@ def self.find(repo, branch_name)
         end
       end
 
-      def initialize(repository, name, target, target_commit)
-        super(repository, name, target, target_commit)
-      end
-
       def active?
         self.dereferenced_target.committed_date >= STALE_BRANCH_THRESHOLD.ago
       end
diff --git a/lib/gitlab/reactive_cache_set_cache.rb b/lib/gitlab/reactive_cache_set_cache.rb
index e4a92ed5122eeb..7ccbeadfd8a950 100644
--- a/lib/gitlab/reactive_cache_set_cache.rb
+++ b/lib/gitlab/reactive_cache_set_cache.rb
@@ -10,10 +10,6 @@ def initialize(expires_in: 10.minutes)
       @expires_in = expires_in
     end
 
-    def cache_key(key)
-      super(key)
-    end
-
     def clear_cache!(key)
       with do |redis|
         keys = read(key).map { |value| "#{cache_namespace}:#{value}" }
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 581d6b738f3616..b77f48d1a2c820 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -4,10 +4,6 @@ module Gitlab
   class SnippetSearchResults < SearchResults
     include SnippetsHelper
 
-    def initialize(current_user, query)
-      super(current_user, query)
-    end
-
     def objects(scope, page: nil, per_page: DEFAULT_PER_PAGE, preload_method: nil)
       paginated_objects(snippet_titles, page, per_page)
     end
diff --git a/qa/qa/resource/group_deploy_token.rb b/qa/qa/resource/group_deploy_token.rb
index c1d6be6547ab45..4c9b296ece11fe 100644
--- a/qa/qa/resource/group_deploy_token.rb
+++ b/qa/qa/resource/group_deploy_token.rb
@@ -17,10 +17,6 @@ class GroupDeployToken < Base
         end
       end
 
-      def fabricate_via_api!
-        super
-      end
-
       def api_get_path
         "/groups/#{group.id}/deploy_tokens"
       end
diff --git a/qa/qa/resource/project_access_token.rb b/qa/qa/resource/project_access_token.rb
index f5cd8798f19473..58cb3e667c0f6d 100644
--- a/qa/qa/resource/project_access_token.rb
+++ b/qa/qa/resource/project_access_token.rb
@@ -15,10 +15,6 @@ class ProjectAccessToken < Base
         Page::Project::Settings::AccessTokens.perform(&:created_access_token)
       end
 
-      def fabricate_via_api!
-        super
-      end
-
       def api_get_path
         "/projects/#{project.api_resource[:id]}/access_tokens"
       end
diff --git a/qa/qa/resource/project_deploy_token.rb b/qa/qa/resource/project_deploy_token.rb
index b31a7c25157da7..d61251030257e5 100644
--- a/qa/qa/resource/project_deploy_token.rb
+++ b/qa/qa/resource/project_deploy_token.rb
@@ -17,10 +17,6 @@ class ProjectDeployToken < Base
         end
       end
 
-      def fabricate_via_api!
-        super
-      end
-
       def api_get_path
         "/projects/#{project.id}/deploy_tokens"
       end
-- 
GitLab