Replace deprecated find(:first, ...) by first(...) call

2 files changed, 4 insertions, 4 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb
index 6d1f889e2ed..00d4e7c04a7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/metrics_controller.rb
@@ -44,7 +44,7 @@ class Api::MetricsController < Api::RestController
   end
 
   def create
-    metric_test = Metric.find(:first, :conditions => ['name=? OR id=?', params[:id], params[:id].to_i])
+    metric_test = Metric.first(:conditions => ['name=? OR id=?', params[:id], params[:id].to_i])
 
     exist_and_is_disable = !metric_test.nil? && !metric_test.enabled?
     if exist_and_is_disable
@@ -65,7 +65,7 @@ class Api::MetricsController < Api::RestController
   end
 
   def update
-    metric = Metric.find(:first, :conditions => ['(name=? OR id=?) AND enabled=? AND origin<>?', params[:id], params[:id].to_i, true, Metric::ORIGIN_JAVA])
+    metric = Metric.first(:conditions => ['(name=? OR id=?) AND enabled=? AND origin<>?', params[:id], params[:id].to_i, true, Metric::ORIGIN_JAVA])
     if metric
       begin
         metric.attributes = params.merge({:name => params[:id], :short_name => params[:name], :enabled => true})
@@ -81,7 +81,7 @@ class Api::MetricsController < Api::RestController
   end
 
   def destroy
-    metric = Metric.find(:first, :conditions => ['(name=? OR id=?) AND enabled=? AND origin<>?', params[:id], params[:id].to_i, true, Metric::ORIGIN_JAVA])
+    metric = Metric.first(:conditions => ['(name=? OR id=?) AND enabled=? AND origin<>?', params[:id], params[:id].to_i, true, Metric::ORIGIN_JAVA])
     if !metric
       rest_status_ko('Unable to delete : Metric [' + params[:id] + '] does not exist', 404)
     else
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
index d6942b6c6ca..640ddec3870 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb
@@ -42,7 +42,7 @@ class MetricsController < ApplicationController
     if params[:id]
       metric = Metric.find(params[:id].to_i)
     else
-      metric = Metric.find(:first, :conditions => ["name = ?", metric_name])
+      metric = Metric.first(:conditions => ["name = ?", metric_name])
       if metric
         @reactivate_metric = metric
       else