SONAR-3893 Renamed column in SNAPSHOT_DATA from value to snapshot_data

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java b/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java
index 5a875e32312d9c70fd3a7541cc7866df5432b5e7..d0ef14aebeb61a895e316a657635029b98276ef8 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/ComponentDataPersister.java
@@ -47,7 +47,7 @@ public class ComponentDataPersister implements ScanPersister {
           dto.setSnapshotId(snapshot.getId());
           dto.setResourceId(snapshot.getResourceId());
           dto.setDataType(dataEntry.key());
-          dto.setValue(dataEntry.value().writeString());
+          dto.setData(dataEntry.value().writeString());
 
           // TODO bulk insert
           dao.insert(dto);

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/ComponentDataPersisterTest/should_persist_component_data-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/ComponentDataPersisterTest/should_persist_component_data-result.xml
index 559c33319a28648f2685e7cbe7abdae917f09701..647650b1da03face9ec6b78522395ce5a90844d1 100644 (file)
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/ComponentDataPersisterTest/should_persist_component_data-result.xml
+++ b/sonar-batch/src/test/resources/org/sonar/batch/index/ComponentDataPersisterTest/should_persist_component_data-result.xml
@@ -1,5 +1,5 @@
 <dataset>
   <snapshots id="100" project_id="200" islast="[true]"/>
-  <snapshot_data id="1" snapshot_id="100" resource_id="200" value="content of symbol" data_type="SYMBOL" created_at="[null]" updated_at="[null]"/>
-  <snapshot_data id="2" snapshot_id="100" resource_id="200" value="content of syntax" data_type="SYNTAX" created_at="[null]" updated_at="[null]" />
+  <snapshot_data id="1" snapshot_id="100" resource_id="200" snapshot_data="content of symbol" data_type="SYMBOL" created_at="[null]" updated_at="[null]"/>
+  <snapshot_data id="2" snapshot_id="100" resource_id="200" snapshot_data="content of syntax" data_type="SYNTAX" created_at="[null]" updated_at="[null]" />
 </dataset>
\ No newline at end of file

diff --git a/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java b/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java
index 085f8eb49904d1d4692ef2ea0007f84946a2a21d..91936ce34ee1ffa18405143b1a5795ce04159d57 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java
+++ b/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java
@@ -73,11 +73,11 @@ public class HtmlSourceDecorator implements ServerComponent {
   }
 
   private void loadSnapshotData(DecorationDataHolder decorationDataHolder, SnapshotDataDto snapshotDataEntry) {
-    if(!Strings.isNullOrEmpty(snapshotDataEntry.getValue())) {
+    if(!Strings.isNullOrEmpty(snapshotDataEntry.getData())) {
       if (SnapshotDataType.isSyntaxHighlighting(snapshotDataEntry.getDataType())) {
-        decorationDataHolder.loadSyntaxHighlightingData(snapshotDataEntry.getValue());
+        decorationDataHolder.loadSyntaxHighlightingData(snapshotDataEntry.getData());
       } else if (SnapshotDataType.isSymbolHighlighting(snapshotDataEntry.getDataType())) {
-        decorationDataHolder.loadSymbolReferences(snapshotDataEntry.getValue());
+        decorationDataHolder.loadSymbolReferences(snapshotDataEntry.getData());
       }
     }
   }

diff --git a/sonar-core/src/main/java/org/sonar/core/source/jdbc/SnapshotDataDto.java b/sonar-core/src/main/java/org/sonar/core/source/jdbc/SnapshotDataDto.java
index e42c122bd947cc4c0fe71bc6edb053fdd9cf3702..5d70fda1689a0a2d1c45cb5a867ba8a2123079e8 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/source/jdbc/SnapshotDataDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/source/jdbc/SnapshotDataDto.java
@@ -28,7 +28,7 @@ public class SnapshotDataDto {
   private long id;
   private long snapshotId;
   private long resourceId;
-  private String value;
+  private String data;
   private String dataType;
 
   public long getSnapshotId() {
@@ -39,8 +39,8 @@ public class SnapshotDataDto {
     return resourceId;
   }
 
-  public String getValue() {
-    return value;
+  public String getData() {
+    return data;
   }
 
   public String getDataType() {
@@ -63,8 +63,8 @@ public class SnapshotDataDto {
     this.resourceId = resourceId;
   }
 
-  public void setValue(String value) {
-    this.value = value;
+  public void setData(String data) {
+    this.data = data;
   }
 
   public void setDataType(String dataType) {

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 598a8a1f50be3a32446c66158e9a88249a93a354..837dbbdcf4296d074174bd191ec94f74dee7591c 100644 (file)
--- 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
@@ -554,7 +554,7 @@ CREATE TABLE "SNAPSHOT_DATA" (
   "ID" INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1),
   "SNAPSHOT_ID" INTEGER,
   "RESOURCE_ID" INTEGER,
-  "VALUE" VARCHAR(16777215),
+  "SNAPSHOT_DATA" VARCHAR(16777215),
   "DATA_TYPE" VARCHAR(50),
   "CREATED_AT" TIMESTAMP,
   "UPDATED_AT" TIMESTAMP,

diff --git a/sonar-core/src/main/resources/org/sonar/core/source/jdbc/SnapshotDataMapper.xml b/sonar-core/src/main/resources/org/sonar/core/source/jdbc/SnapshotDataMapper.xml
index ca10588f169e5320809feab1111a248eff86707b..6d92b6fb87801c4ed02c3e7a025cedb27fb190ed 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/source/jdbc/SnapshotDataMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/source/jdbc/SnapshotDataMapper.xml
@@ -6,7 +6,7 @@
   <select id="selectSnapshotData" parameterType="map" resultType="SnapshotData">
     SELECT
       snapshot_id AS "snapshotId",
-      value,
+      snapshot_data AS "data",
       data_type AS "dataType"
     FROM snapshot_data
     WHERE snapshot_id = #{sid}
@@ -15,9 +15,9 @@
 
   <insert id="insert" parameterType="SnapshotData" useGeneratedKeys="false">
     insert into snapshot_data
-    (resource_id, snapshot_id, value, data_type, created_at, updated_at)
+    (resource_id, snapshot_id, snapshot_data, data_type, created_at, updated_at)
     values (
-    #{resourceId}, #{snapshotId}, #{value}, #{dataType}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
+    #{resourceId}, #{snapshotId}, #{data}, #{dataType}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
   </insert>
 
     <!-- Oracle -->
@@ -26,9 +26,9 @@
             select snapshot_data_seq.NEXTVAL from DUAL
         </selectKey>
         insert into snapshot_data
-        (id, resource_id, snapshot_id, value, data_type, created_at, updated_at)
+        (id, resource_id, snapshot_id, snapshot_data, data_type, created_at, updated_at)
         values (
-        #{id}, #{resourceId}, #{snapshotId}, #{value}, #{dataType}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
+        #{id}, #{resourceId}, #{snapshotId}, #{data}, #{dataType}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
     </insert>
 </mapper>
 

diff --git a/sonar-core/src/test/java/org/sonar/core/source/jdbc/SnapshotDataDaoTest.java b/sonar-core/src/test/java/org/sonar/core/source/jdbc/SnapshotDataDaoTest.java
index 722bd427fa65f5d88e3469bce6bd3c18fcf8e408..873b7d67236504c9ac47cd952e80c018347c2884 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/source/jdbc/SnapshotDataDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/source/jdbc/SnapshotDataDaoTest.java
@@ -46,7 +46,7 @@ public class SnapshotDataDaoTest extends AbstractDaoTestCase {
 
     assertThat(data).onProperty("snapshotId").containsOnly(10L, 10L);
     assertThat(data).onProperty("dataType").containsOnly("highlight_syntax", "symbol");
-    assertThat(data).onProperty("value").containsOnly("0,10,k;", "20,25,20,35,45;");
+    assertThat(data).onProperty("data").containsOnly("0,10,k;", "20,25,20,35,45;");
   }
 
   @Test
@@ -58,7 +58,7 @@ public class SnapshotDataDaoTest extends AbstractDaoTestCase {
     SnapshotDataDto dto = new SnapshotDataDto();
     dto.setResourceId(1L);
     dto.setSnapshotId(11L);
-    dto.setValue(data);
+    dto.setData(data);
     dto.setDataType(dataType);
 
     dao.insert(dto);
@@ -67,6 +67,6 @@ public class SnapshotDataDaoTest extends AbstractDaoTestCase {
 
     assertThat(serializedData).onProperty("snapshotId").containsOnly(11L);
     assertThat(serializedData).onProperty("dataType").containsOnly(dataType);
-    assertThat(serializedData).onProperty("value").containsOnly(data);
+    assertThat(serializedData).onProperty("data").containsOnly(data);
   }
 }

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml
index e30cf0771ffcaf017467c260ca5dc6f6deb392fc..02e17b8031c28a5dadb85a607def246196bbe6e4 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot-result.xml
@@ -34,6 +34,6 @@
   <events id="1" name="Version 1.0" resource_id="1" snapshot_id="1" category="VERSION" description="[null]"
           event_date="2008-12-02 13:58:00.00" created_at="[null]"/>
   <duplications_index id="1" project_snapshot_id="1" snapshot_id="1" hash="bb" index_in_file="0" start_line="0" end_line="0"/>
-  <snapshot_data id="1" resource_id="1" snapshot_id="1" value="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
+  <snapshot_data id="1" resource_id="1" snapshot_id="1" snapshot_data="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
 
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml
index c0ec987c1c0450305ceec789a926ab62ad46ce99..18553c8b9d45a53e8622570193407c5f88b0084f 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldDeleteSnapshot.xml
@@ -32,7 +32,7 @@
   <events id="1" name="Version 1.0" resource_id="1" snapshot_id="1" category="VERSION" description="[null]"
           event_date="2008-12-02 13:58:00.00" created_at="[null]"/>
   <duplications_index id="1" project_snapshot_id="1" snapshot_id="1" hash="bb" index_in_file="0" start_line="0" end_line="0"/>
-  <snapshot_data id="1" resource_id="1" snapshot_id="1" value="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
+  <snapshot_data id="1" resource_id="1" snapshot_id="1" snapshot_data="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
 
 
     <!-- snapshot to remove, id 5 on resource 5-->
@@ -74,7 +74,7 @@
   <events id="2" name="Version 1.0" resource_id="5" snapshot_id="5" category="VERSION" description="[null]"
           event_date="2008-12-02 13:58:00.00" created_at="[null]"/>
   <duplications_index id="2" project_snapshot_id="5" snapshot_id="5" hash="bb" index_in_file="0" start_line="0" end_line="0"/>
-  <snapshot_data id="2" resource_id="5" snapshot_id="5" value="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
+  <snapshot_data id="2" resource_id="5" snapshot_id="5" snapshot_data="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
 
 
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml
index c549d4d9aa944b66be34593e26e8e469fb6a3c39..90b1395df3118a0e6f1ce77a43f9bcce81954abf 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot-result.xml
@@ -98,6 +98,6 @@ Note that measures, events and reviews are not deleted.
            rule_failure_permanent_id="1" resolution="[null]" created_at="[null]" updated_at="[null]" resource_line="200" severity="BLOCKER"
            user_id="300" assignee_id="300" rule_id="500" manual_violation="[true]" manual_severity="[false]" title="[null]" data="[null]"/>
 
-  <snapshot_data id="2" resource_id="5" snapshot_id="5" value="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
+  <snapshot_data id="2" resource_id="5" snapshot_id="5" snapshot_data="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
 
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml
index 2bc87ca4bc6f66999ef483bd8035cedc317e192d..6d634a6df4d1d06b8ef11c9fabeaf88fd58b43b5 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeCommandsTest/shouldPurgeSnapshot.xml
@@ -44,7 +44,7 @@
     rule_failure_permanent_id="1" resolution="[null]" created_at="[null]" updated_at="[null]" resource_line="200" severity="BLOCKER"
     user_id="300" assignee_id="300" rule_id="500" manual_violation="[true]" manual_severity="[false]" title="[null]" data="[null]"/>
 
-  <snapshot_data id="1" resource_id="1" snapshot_id="1" value="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
+  <snapshot_data id="1" resource_id="1" snapshot_id="1" snapshot_data="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
 
 
   <!-- The following is not purged but is kept for DBUnit -->
@@ -92,6 +92,6 @@
       rule_failure_permanent_id="1" resolution="[null]" created_at="[null]" updated_at="[null]" resource_line="200" severity="BLOCKER"
       user_id="300" assignee_id="300" rule_id="500" manual_violation="[true]" manual_severity="[false]" title="[null]" data="[null]"/>
 
-    <snapshot_data id="2" resource_id="5" snapshot_id="5" value="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
+    <snapshot_data id="2" resource_id="5" snapshot_id="5" snapshot_data="0,10,k" data_type="highlight_syntax" created_at="[null]" updated_at="[null]" />
 
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/source/HtmlSourceDecoratorTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/source/HtmlSourceDecoratorTest/shared.xml
index 28d52215a1967174c9afe68fc611c87a6e7725ce..e5d7cca18b9d6e0763d8f729c10e86303f6812ee 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/source/HtmlSourceDecoratorTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/source/HtmlSourceDecoratorTest/shared.xml
@@ -7,10 +7,10 @@
     <snapshots id="13" project_id="3" islast="[true]" />
     <snapshots id="14" project_id="3" islast="[true]" />
 
-    <snapshot_data id="101" resource_id="1" snapshot_id="11" value="0,16,cppd;18,25,k;25,31,k;" data_type="highlight_syntax" />
-    <snapshot_data id="102" resource_id="2" snapshot_id="12" value="31,41,31;" data_type="symbol" />
-    <snapshot_data id="103" resource_id="3" snapshot_id="13" value="0,16,cppd;18,25,k;25,31,k;46,52,k;53,57,k;72,78,k;79,83,k;" data_type="highlight_syntax" />
-    <snapshot_data id="104" resource_id="3" snapshot_id="13" value="31,41,31;58,61,58,96;84,87,84;" data_type="symbol" />
+    <snapshot_data id="101" resource_id="1" snapshot_id="11" snapshot_data="0,16,cppd;18,25,k;25,31,k;" data_type="highlight_syntax" />
+    <snapshot_data id="102" resource_id="2" snapshot_id="12" snapshot_data="31,41,31;" data_type="symbol" />
+    <snapshot_data id="103" resource_id="3" snapshot_id="13" snapshot_data="0,16,cppd;18,25,k;25,31,k;46,52,k;53,57,k;72,78,k;79,83,k;" data_type="highlight_syntax" />
+    <snapshot_data id="104" resource_id="3" snapshot_id="13" snapshot_data="31,41,31;58,61,58,96;84,87,84;" data_type="symbol" />
 
     <snapshot_sources id="101" snapshot_id="11" data="/*&#10; * Header&#10; */&#10;&#10;public class HelloWorld {&#10;}" />
     <snapshot_sources id="102" snapshot_id="12" data="/*&#10; * Header&#10; */&#10;&#10;public class HelloWorld {&#10;}" />

diff --git a/sonar-core/src/test/resources/org/sonar/core/source/jdbc/SnapshotDataDaoTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/source/jdbc/SnapshotDataDaoTest/shared.xml
index dae0a67012d96ab1cd4695c8aac11505f4b430f6..17b33d0474b3ee593803897e104554582670eea2 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/source/jdbc/SnapshotDataDaoTest/shared.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/source/jdbc/SnapshotDataDaoTest/shared.xml
@@ -5,7 +5,7 @@
     <snapshots id="10" project_id="1" islast="[false]" />
     <snapshots id="11" project_id="1" islast="[true]" />
 
-    <snapshot_data id="101" resource_id="1" snapshot_id="10" value="0,10,k;" data_type="highlight_syntax" />
-    <snapshot_data id="102" resource_id="1" snapshot_id="10" value="20,25,20,35,45;" data_type="symbol" />
+    <snapshot_data id="101" resource_id="1" snapshot_id="10" snapshot_data="0,10,k;" data_type="highlight_syntax" />
+    <snapshot_data id="102" resource_id="1" snapshot_id="10" snapshot_data="20,25,20,35,45;" data_type="symbol" />
 
 </dataset>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb
index 0a889e264d0a8fc7d049c3b04ef47c3948d0a460..6b63b970769d1a03ecb4a1f11fc7edb4199a14dc 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/387_create_snapshot_data.rb
@@ -28,7 +28,7 @@ class CreateSnapshotData < ActiveRecord::Migration
     create_table :snapshot_data do |t|
       t.column :snapshot_id,    :integer,     :null => true
       t.column :resource_id,    :integer,     :null => true
-      t.column :value,          :text,        :null => true
+      t.column :snapshot_data,  :text,        :null => true
       t.column :data_type,      :string,      :null => true,    :limit => 50
       t.timestamps
     end