SONAR-3636 Update MyBatis DTO method name

diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
index deaa26e9baf3ea1953fbd32ec39e326d2719363b..7d50a1094b849b03b18938e1710d05eb1a4ebca6 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
@@ -106,7 +106,7 @@ public class ResourceDao {
     try {
       for (ResourceDto resource : resources) {
         if (resource.getId() == null) {
-          resource.setDate(new Date());
+          resource.setCreatedAt(new Date());
           mapper.insert(resource);
         } else {
           mapper.update(resource);

diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
index d8855935b84a697ecd754d59c1484bac80dba6c1..73ee680a5d4d3d4723b4b474b1e6143fd51ee813 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
@@ -36,7 +36,7 @@ public final class ResourceDto {
   private Long copyResourceId;
   private Long personId;
   private Long profileId;
-  private Date date;
+  private Date createdAt;
 
   public Long getId() {
     return id;
@@ -155,12 +155,12 @@ public final class ResourceDto {
     return this;
   }
 
-  public Date getDate() {
-    return date;// NOSONAR May expose internal representation by returning reference to mutable object
+  public Date getCreatedAt() {
+    return createdAt;// NOSONAR May expose internal representation by returning reference to mutable object
   }
 
-  public ResourceDto setDate(Date date) {
-    this.date = date;// NOSONAR May expose internal representation by incorporating reference to mutable object
+  public ResourceDto setCreatedAt(Date date) {
+    this.createdAt = date;// NOSONAR May expose internal representation by incorporating reference to mutable object
     return this;
   }
 }

diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
index de2ba7b4c45b71a83ac92c7c77afcc5ec19e8b89..1d51aff6cc66f57019c178b27a486eee47b74654 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
@@ -35,7 +35,7 @@
     <result property="copyResourceId" column="copy_resource_id"/>
     <result property="personId" column="person_id"/>
     <result property="profileId" column="profile_id"/>
-    <result property="date" column="created_at"/>
+    <result property="createdAt" column="created_at"/>
   </resultMap>
 
   <select id="selectResources" parameterType="map" resultMap="resourceResultMap">
@@ -90,7 +90,7 @@
     values (
     #{name}, #{longName}, #{description}, #{scope}, #{qualifier},
     #{key}, #{language}, #{rootId}, #{copyResourceId},
-    #{personId}, #{profileId}, #{enabled}, #{date}
+    #{personId}, #{profileId}, #{enabled}, #{createdAt}
     )
   </insert>
 
@@ -104,7 +104,7 @@
     values (
     #{id}, #{name}, #{longName}, #{description}, #{scope}, #{qualifier},
     #{key}, #{language}, #{rootId}, #{copyResourceId},
-    #{personId}, #{profileId}, #{enabled}, #{date}
+    #{personId}, #{profileId}, #{enabled}, #{createdAt}
     )
   </insert>
 

diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java
index 86d75afbef502c7ef73cff9cc514203638294324..261cdcd92ad4f3d6d86904d50eb22f42ea930f12 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java
@@ -177,6 +177,6 @@ public class ResourceDaoTest extends AbstractDaoTestCase {
 
     // SONAR-3636 : created_at must be fed when inserting a new entry in the 'projects' table
     ResourceDto fileLoadedFromDB = dao.getResource(file1.getId());
-    assertThat(fileLoadedFromDB.getDate()).isNotNull();
+    assertThat(fileLoadedFromDB.getCreatedAt()).isNotNull();
   }
 }