SONAR-7453 Fix RULES alias for Oracle

2 files changed, 17 insertions, 17 deletions

diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
index 41115748c70..55afe2e559e 100644
--- a/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleDto.java
@@ -60,11 +60,11 @@ public class RuleDto {
   private Date noteCreatedAt;
   private Date noteUpdatedAt;
   private String remediationFunction;
-  private String defaultRemediationFunction;
+  private String defRemediationFunction;
   private String remediationGapMultiplier;
-  private String defaultRemediationGapMultiplier;
+  private String defRemediationGapMultiplier;
   private String remediationBaseEffort;
-  private String defaultRemediationBaseEffort;
+  private String defRemediationBaseEffort;
   private String gapDescription;
   private String tags;
   private String systemTags;
@@ -253,11 +253,11 @@ public class RuleDto {
 
   @CheckForNull
   public String getDefaultRemediationFunction() {
-    return defaultRemediationFunction;
+    return defRemediationFunction;
   }
 
   public RuleDto setDefaultRemediationFunction(@Nullable String defaultRemediationFunction) {
-    this.defaultRemediationFunction = defaultRemediationFunction;
+    this.defRemediationFunction = defaultRemediationFunction;
     return this;
   }
 
@@ -273,11 +273,11 @@ public class RuleDto {
 
   @CheckForNull
   public String getDefaultRemediationGapMultiplier() {
-    return defaultRemediationGapMultiplier;
+    return defRemediationGapMultiplier;
   }
 
   public RuleDto setDefaultRemediationGapMultiplier(@Nullable String defaultRemediationGapMultiplier) {
-    this.defaultRemediationGapMultiplier = defaultRemediationGapMultiplier;
+    this.defRemediationGapMultiplier = defaultRemediationGapMultiplier;
     return this;
   }
 
@@ -293,11 +293,11 @@ public class RuleDto {
 
   @CheckForNull
   public String getDefaultRemediationBaseEffort() {
-    return defaultRemediationBaseEffort;
+    return defRemediationBaseEffort;
   }
 
   public RuleDto setDefaultRemediationBaseEffort(@Nullable String defaultRemediationBaseEffort) {
-    this.defaultRemediationBaseEffort = defaultRemediationBaseEffort;
+    this.defRemediationBaseEffort = defaultRemediationBaseEffort;
     return this;
   }
 
diff --git a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
index 6dca6fe7406..d857846bb36 100644
--- a/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/rule/RuleMapper.xml
@@ -21,11 +21,11 @@
     r.note_created_at as "noteCreatedAt",
     r.note_updated_at as "noteUpdatedAt",
     r.remediation_function as "remediationFunction",
-    r.def_remediation_function as "defaultRemediationFunction",
+    r.def_remediation_function as "defRemediationFunction",
     r.remediation_gap_mult as "remediationGapMultiplier",
-    r.def_remediation_gap_mult as "defaultRemediationGapMultiplier",
+    r.def_remediation_gap_mult as "defRemediationGapMultiplier",
     r.remediation_base_effort as "remediationBaseEffort",
-    r.def_remediation_base_effort as "defaultRemediationBaseEffort",
+    r.def_remediation_base_effort as "defRemediationBaseEffort",
     r.gap_description as "gapDescription",
     r.tags as "tagsField",
     r.system_tags as "systemTagsField",
@@ -129,11 +129,11 @@
     note_created_at=#{noteCreatedAt},
     note_updated_at=#{noteUpdatedAt},
     remediation_function=#{remediationFunction},
-    def_remediation_function=#{defaultRemediationFunction},
+    def_remediation_function=#{defRemediationFunction},
     remediation_gap_mult=#{remediationGapMultiplier},
-    def_remediation_gap_mult=#{defaultRemediationGapMultiplier},
+    def_remediation_gap_mult=#{defRemediationGapMultiplier},
     remediation_base_effort=#{remediationBaseEffort},
-    def_remediation_base_effort=#{defaultRemediationBaseEffort},
+    def_remediation_base_effort=#{defRemediationBaseEffort},
     gap_description=#{gapDescription},
     tags=#{tagsField},
     system_tags=#{systemTagsField},
@@ -156,8 +156,8 @@
     <include refid="insertColumns"/>
     values (#{ruleKey}, #{repositoryKey}, #{description}, #{descriptionFormat}, #{status}, #{name}, #{configKey},
     #{severity}, #{isTemplate}, #{language}, #{templateId},
-    #{remediationFunction}, #{defaultRemediationFunction},
-    #{remediationGapMultiplier}, #{defaultRemediationGapMultiplier}, #{remediationBaseEffort}, #{defaultRemediationBaseEffort},
+    #{remediationFunction}, #{defRemediationFunction},
+    #{remediationGapMultiplier}, #{defRemediationGapMultiplier}, #{remediationBaseEffort}, #{defRemediationBaseEffort},
     #{gapDescription}, #{tagsField}, #{systemTagsField}, #{type,jdbcType=INTEGER}, #{noteData}, #{noteUserLogin}, #{noteCreatedAt},
     #{noteUpdatedAt}, #{createdAt}, #{updatedAt})
   </insert>