From 406435360f01dab8729475a5d57731f10efaaefd Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Thu, 4 Jun 2015 11:40:21 +0200 Subject: [PATCH] SONAR-6606 drop origin column from metrics table --- .../sonar/server/metric/ws/CreateAction.java | 3 +- .../metric/persistence/MetricDaoTest.java | 4 --- .../server/metric/ws/CreateActionTest.java | 1 - .../sonar/server/metric/ws/MetricTesting.java | 1 - .../ignore_person_measures.xml | 2 +- .../ignore_quality_model_measures.xml | 2 +- .../MeasureFilterExecutorTest/shared.xml | 8 ++--- .../sort_by_alert.xml | 2 +- .../MetricDaoTest/manual_metric.xml | 2 +- .../persistence/MetricDaoTest/shared.xml | 6 ++-- .../shouldAddUserManagesMetric-result.xml | 4 +-- .../shouldEnableOnlyLoadedMetrics.xml | 4 +-- ...serManagesMetricIfAlreadyExists-result.xml | 4 +-- ...UpdateUserManagesMetricIfAlreadyExists.xml | 4 +-- .../shouldSaveIfNew-result.xml | 8 ++--- .../RegisterMetricsTest/shouldSaveIfNew.xml | 4 +-- .../shouldUpdateIfAlreadyExists-result.xml | 4 +-- .../shouldUpdateIfAlreadyExists.xml | 4 +-- .../app/controllers/metrics_controller.rb | 9 ----- .../main/webapp/WEB-INF/app/models/metric.rb | 8 ----- .../db/migrate/917_remove_metrics_origin.rb | 31 +++++++++++++++++ .../org/sonar/core/metric/db/MetricDto.java | 11 ------- .../core/persistence/DatabaseVersion.java | 9 +++-- .../org/sonar/core/metric/db/MetricMapper.xml | 5 ++- .../org/sonar/core/persistence/rows-h2.sql | 1 + .../org/sonar/core/persistence/schema-h2.ddl | 1 - .../sonar/core/metric/db/MetricDtoTest.java | 2 -- .../org/sonar/jpa/dao/MeasuresDaoTest.java | 11 ++----- .../shouldCleanConditions-result.xml | 6 ++-- .../shouldCleanConditions.xml | 6 ++-- .../java/org/sonar/api/measures/Metric.java | 33 +------------------ .../org/sonar/api/measures/MetricTest.java | 1 - 32 files changed, 77 insertions(+), 124 deletions(-) create mode 100644 server/sonar-web/src/main/webapp/WEB-INF/db/migrate/917_remove_metrics_origin.rb diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java index 9c1e504685f..75fbf567a5e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/CreateAction.java @@ -162,8 +162,7 @@ public class CreateAction implements MetricsWsAction { .setQualitative(false) .setHidden(false) .setOptimizedBestValue(false) - .setDeleteHistoricalData(false) - .setOrigin("GUI"); + .setDeleteHistoricalData(false); dbClient.metricDao().insert(dbSession, metric); dbSession.commit(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java index 8fae20fa06a..d9d9e168f4d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/persistence/MetricDaoTest.java @@ -66,7 +66,6 @@ public class MetricDaoTest { assertThat(result.getDescription()).isEqualTo("Coverage by unit tests"); assertThat(result.getDomain()).isEqualTo("Tests"); assertThat(result.getValueType()).isEqualTo("PERCENT"); - assertThat(result.getOrigin()).isEqualTo("JAV"); assertThat(result.getDirection()).isEqualTo(1); assertThat(result.isQualitative()).isTrue(); assertThat(result.isUserManaged()).isFalse(); @@ -99,7 +98,6 @@ public class MetricDaoTest { assertThat(result.getDescription()).isEqualTo("Manual metric"); assertThat(result.getDomain()).isNullOrEmpty(); assertThat(result.getValueType()).isEqualTo("INT"); - assertThat(result.getOrigin()).isEqualTo("GUI"); assertThat(result.getDirection()).isEqualTo(0); assertThat(result.isQualitative()).isFalse(); assertThat(result.isUserManaged()).isTrue(); @@ -133,7 +131,6 @@ public class MetricDaoTest { .setBestValue(100d) .setOptimizedBestValue(true) .setDirection(1) - .setOrigin("JAV") .setHidden(true) .setDeleteHistoricalData(true) .setEnabled(true)); @@ -145,7 +142,6 @@ public class MetricDaoTest { assertThat(result.getDescription()).isEqualTo("Coverage by unit tests"); assertThat(result.getDomain()).isEqualTo("Tests"); assertThat(result.getValueType()).isEqualTo("PERCENT"); - assertThat(result.getOrigin()).isEqualTo("JAV"); assertThat(result.getDirection()).isEqualTo(1); assertThat(result.isQualitative()).isTrue(); assertThat(result.isUserManaged()).isTrue(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java index 960f1c9aa35..41e5dd88af5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java @@ -102,7 +102,6 @@ public class CreateActionTest { assertThat(metric.isEnabled()).isTrue(); assertThat(metric.getDirection()).isEqualTo(0); assertThat(metric.isQualitative()).isFalse(); - assertThat(metric.getOrigin()).isEqualTo("GUI"); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java index 42bfff34dc9..480e8be107b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java @@ -46,7 +46,6 @@ public class MetricTesting { .setEnabled(RandomUtils.nextBoolean()) .setOptimizedBestValue(RandomUtils.nextBoolean()) .setQualitative(RandomUtils.nextBoolean()) - .setOrigin(RandomStringUtils.randomAlphabetic(3)) .setUserManaged(RandomUtils.nextBoolean()) .setWorstValue(RandomUtils.nextDouble()); } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml index 06a16b28952..8cf1a3b824e 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/measure/MeasureFilterExecutorTest/ignore_person_measures.xml @@ -1,6 +1,6 @@ diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml index 7fd1fb96b53..968b9e9f3d8 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists-result.xml @@ -1,6 +1,6 @@ \ No newline at end of file + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml index 75364e33f6c..ed24c0d990a 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldNotUpdateUserManagesMetricIfAlreadyExists.xml @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml index cff4608e387..182a4a8e3bb 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew-result.xml @@ -1,12 +1,12 @@ \ No newline at end of file + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml index 42e63593dd5..3f7c90205e1 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldSaveIfNew.xml @@ -1,6 +1,6 @@ \ No newline at end of file + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml index e5301d28485..ed9a86d0f2a 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists-result.xml @@ -1,6 +1,6 @@ \ No newline at end of file + diff --git a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml index 9c4c4a69f38..fb9242edb48 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/startup/RegisterMetricsTest/shouldUpdateIfAlreadyExists.xml @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb index d227701f6d0..0cd475f4485 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/metrics_controller.rb @@ -70,15 +70,7 @@ class MetricsController < ApplicationController else metric = Metric.first(:conditions => ["name = ?", metric_name]) if metric - if metric.origin != Metric::ORIGIN_GUI - @errors << "A standard metric named '#{metric_name}' already exists. Please change the name of the manual metric you want to create." - @metric = Metric.new - @domains = metric.domain - render :partial => 'metrics/create_form', :status => 400 - return - else @reactivate_metric = metric - end else metric = Metric.new end @@ -94,7 +86,6 @@ class MetricsController < ApplicationController metric.direction = 0 metric.user_managed = true metric.qualitative = false - metric.origin = Metric::ORIGIN_GUI metric.enabled = true unless @reactivate_metric begin diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/models/metric.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/models/metric.rb index e437a2bd370..204c8f49b83 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/models/metric.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/models/metric.rb @@ -37,10 +37,6 @@ class Metric < ActiveRecord::Base TYPE_LEVEL_WARN = 'WARN' TYPE_LEVEL_ERROR = 'ERROR' - ORIGIN_GUI='GUI' - ORIGIN_JAVA='JAV' - ORIGIN_WS='WS' - CACHE_KEY='metrics' I18N_DOMAIN_CACHE_KEY='i18n_domains' I18N_SHORT_NAME_CACHE_KEY='i18n_metric_short_names' @@ -300,10 +296,6 @@ class Metric < ActiveRecord::Base end end - def created_online? - origin==ORIGIN_GUI - end - HUMANIZED_ATTRIBUTES = { :name => "key", :short_name => "name", diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/917_remove_metrics_origin.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/917_remove_metrics_origin.rb new file mode 100644 index 00000000000..d08cb7347ec --- /dev/null +++ b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/917_remove_metrics_origin.rb @@ -0,0 +1,31 @@ +# +# SonarQube, open source software quality management tool. +# Copyright (C) 2008-2014 SonarSource +# mailto:contact AT sonarsource DOT com +# +# SonarQube is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3 of the License, or (at your option) any later version. +# +# SonarQube is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# + +# +# SonarQube 5.2 +# SONAR-6606 +# +class RemoveMetricsOrigin < ActiveRecord::Migration + + def self.up + remove_column 'metrics', 'origin' + end + +end diff --git a/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java b/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java index 9e725c435bb..1ed03515e3d 100644 --- a/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java +++ b/sonar-core/src/main/java/org/sonar/core/metric/db/MetricDto.java @@ -49,8 +49,6 @@ public class MetricDto { private boolean optimizedBestValue; - private String origin; - private boolean hidden; private boolean deleteHistoricalData; @@ -171,15 +169,6 @@ public class MetricDto { return this; } - public String getOrigin() { - return origin; - } - - public MetricDto setOrigin(String origin) { - this.origin = origin; - return this; - } - public boolean isHidden() { return hidden; } diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java index a07de30f906..9eb31a6089b 100644 --- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java +++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java @@ -21,13 +21,12 @@ package org.sonar.core.persistence; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; +import java.util.Collections; +import java.util.List; import org.apache.ibatis.session.SqlSession; import org.sonar.api.batch.BatchSide; import org.sonar.api.server.ServerSide; -import java.util.Collections; -import java.util.List; - /** * @since 3.0 */ @@ -35,7 +34,7 @@ import java.util.List; @ServerSide public class DatabaseVersion { - public static final int LAST_VERSION = 916; + public static final int LAST_VERSION = 917; /** * List of all the tables.n @@ -135,7 +134,7 @@ public class DatabaseVersion { } } - public static enum Status { + public enum Status { UP_TO_DATE, REQUIRES_UPGRADE, REQUIRES_DOWNGRADE, FRESH_INSTALL } } diff --git a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml b/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml index c95ddd0e931..38f07455cf6 100644 --- a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml @@ -14,7 +14,6 @@ m.val_type as valueType, m.user_managed as userManaged, m.enabled, - m.origin, m.worst_value as worstValue, m.best_value as bestValue, m.optimized_best_value as optimizedBestValue, @@ -60,13 +59,13 @@ INSERT INTO metrics ( - name, description, direction, domain, short_name, qualitative, val_type, user_managed, enabled, origin, worst_value, + name, description, direction, domain, short_name, qualitative, val_type, user_managed, enabled, worst_value, best_value, optimized_best_value, hidden, delete_historical_data) VALUES ( #{kee, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{direction, jdbcType=INTEGER}, #{domain, jdbcType=VARCHAR}, #{shortName, jdbcType=VARCHAR}, #{qualitative, jdbcType=BOOLEAN}, #{valueType, jdbcType=VARCHAR}, #{userManaged, jdbcType=BOOLEAN}, #{enabled, jdbcType=BOOLEAN}, - #{origin, jdbcType=VARCHAR}, #{worstValue, jdbcType=DOUBLE}, #{bestValue, jdbcType=DOUBLE}, + #{worstValue, jdbcType=DOUBLE}, #{bestValue, jdbcType=DOUBLE}, #{optimizedBestValue, jdbcType=BOOLEAN}, #{hidden, jdbcType=BOOLEAN}, #{deleteHistoricalData, jdbcType=BOOLEAN} ) diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql index 714266f33da..18b38f9a71d 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql @@ -340,6 +340,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('913'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('914'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('915'); INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('916'); +INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('917'); INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null); ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2; diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl index 035a93ad9f3..c7974769cc9 100644 --- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl +++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl @@ -365,7 +365,6 @@ CREATE TABLE "METRICS" ( "VAL_TYPE" VARCHAR(8), "USER_MANAGED" BOOLEAN DEFAULT FALSE, "ENABLED" BOOLEAN DEFAULT TRUE, - "ORIGIN" VARCHAR(3), "WORST_VALUE" DOUBLE, "BEST_VALUE" DOUBLE, "OPTIMIZED_BEST_VALUE" BOOLEAN, diff --git a/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java b/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java index 5c7b9ebfd40..1971940ea00 100644 --- a/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/metric/db/MetricDtoTest.java @@ -41,7 +41,6 @@ public class MetricDtoTest { .setBestValue(100d) .setOptimizedBestValue(true) .setDirection(1) - .setOrigin("JAV") .setHidden(true) .setDeleteHistoricalData(true) .setEnabled(true); @@ -58,7 +57,6 @@ public class MetricDtoTest { assertThat(metricDto.getBestValue()).isEqualTo(100d); assertThat(metricDto.isOptimizedBestValue()).isTrue(); assertThat(metricDto.getDirection()).isEqualTo(1); - assertThat(metricDto.getOrigin()).isEqualTo("JAV"); assertThat(metricDto.isHidden()).isTrue(); assertThat(metricDto.isDeleteHistoricalData()).isTrue(); assertThat(metricDto.isEnabled()).isTrue(); diff --git a/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java b/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java index bab9bcd488d..3c9d299cd3b 100644 --- a/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/jpa/dao/MeasuresDaoTest.java @@ -19,17 +19,15 @@ */ package org.sonar.jpa.dao; +import java.util.Arrays; +import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.sonar.api.database.model.ResourceModel; import org.sonar.api.measures.Metric; import org.sonar.jpa.test.AbstractDbUnitTestCase; -import java.util.Arrays; -import java.util.Collection; - import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertThat; public class MeasuresDaoTest extends AbstractDbUnitTestCase { @@ -57,23 +55,18 @@ public class MeasuresDaoTest extends AbstractDbUnitTestCase { private Collection createMetrics() { Metric m1 = new Metric("metric1"); m1.setEnabled(false); - m1.setOrigin(Metric.Origin.JAV); Metric m2 = new Metric("metric2"); m2.setEnabled(true); - m2.setOrigin(Metric.Origin.JAV); Metric m3 = new Metric("metric3"); m3.setEnabled(false); - m3.setOrigin(Metric.Origin.GUI); Metric m4 = new Metric("metric4"); m4.setEnabled(true); - m4.setOrigin(Metric.Origin.GUI); Metric m5 = new Metric("metric5"); m5.setEnabled(true); - m5.setOrigin(Metric.Origin.WS); return Arrays.asList(m1, m2, m3, m4, m5); } diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml index 1dd295d9e98..dec565c9b87 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml @@ -1,10 +1,10 @@ \ No newline at end of file + diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml index 73a9a3647f1..764d97e999c 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml +++ b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml @@ -1,10 +1,10 @@ \ No newline at end of file + diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java index 33e87d13232..987be1d33e4 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/Metric.java @@ -126,10 +126,6 @@ public class Metric implements Serializable, org.sonar.a } } - public enum Origin { - JAV, GUI, WS - } - @Id @Column(name = "id") @GeneratedValue @@ -166,10 +162,6 @@ public class Metric implements Serializable, org.sonar.a @Column(name = "enabled", updatable = true, nullable = true) private Boolean enabled = Boolean.TRUE; - @Column(name = "origin", updatable = true, nullable = true, length = 3) - @Enumerated(EnumType.STRING) - private Origin origin = Origin.JAV; - @Column(name = "worst_value", updatable = true, nullable = true, precision = 30, scale = 20) private Double worstValue; @@ -245,10 +237,7 @@ public class Metric implements Serializable, org.sonar.a } /** - * Creates a fully qualified metric. This defaults some values: - *
    - *
  • origin : Origin.JAV
    • - *
+ * Creates a fully qualified metric. * * @param key the metric key * @param name the metric name @@ -269,7 +258,6 @@ public class Metric implements Serializable, org.sonar.a this.name = name; this.qualitative = qualitative; this.userManaged = userManaged; - this.origin = Origin.JAV; if (ValueType.PERCENT.equals(this.type)) { this.bestValue = (direction == DIRECTION_BETTER ? 100.0 : 0.0); this.worstValue = (direction == DIRECTION_BETTER ? 0.0 : 100.0); @@ -471,24 +459,6 @@ public class Metric implements Serializable, org.sonar.a return this; } - /** - * @return the origin of the metric - Internal use only - */ - public Origin getOrigin() { - return origin; - } - - /** - * Set the origin of the metric - Internal use only - * - * @param origin the origin - * @return this - */ - public Metric setOrigin(Origin origin) { - this.origin = origin; - return this; - } - public Double getWorstValue() { return worstValue; } @@ -608,7 +578,6 @@ public class Metric implements Serializable, org.sonar.a this.type = with.type; this.name = with.name; this.userManaged = with.userManaged; - this.origin = with.origin; this.hidden = with.hidden; this.deleteHistoricalData = with.deleteHistoricalData; return this; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MetricTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MetricTest.java index c205302fa84..24ae4b69be7 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MetricTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MetricTest.java @@ -48,7 +48,6 @@ public class MetricTest { assertThat(metric.getWorstValue(), nullValue()); assertThat(metric.getDirection(), is(Metric.DIRECTION_NONE)); assertThat(metric.getEnabled(), is(true)); - assertThat(metric.getOrigin(), is(Metric.Origin.JAV)); assertThat(metric.getFormula(), nullValue()); assertThat(metric.getId(), nullValue()); assertThat(metric.getUserManaged(), is(false)); -- 2.39.5