private Integer id;
private Integer profileId;
- private Long ruleId;
+ private Integer ruleId;
private Integer severity;
private String inheritance;
private Date noteCreatedAt;
return this;
}
- public Long getRulId() {
+ public Integer getRulId() {
return ruleId;
}
- public ActiveRuleDto setRuleId(Long ruleId) {
+ public ActiveRuleDto setRuleId(Integer ruleId) {
this.ruleId = ruleId;
return this;
}
}
}
- public RuleDto selectById(Long id) {
+ public RuleDto selectById(Integer id) {
SqlSession session = mybatis.openSession();
try {
return getMapper(session).selectById(id);
}
}
- public List<RuleParamDto> selectParameters(Long id) {
+ public List<RuleParamDto> selectParameters(Integer id) {
SqlSession session = mybatis.openSession();
try {
return selectParameters(id, session);
}
}
- public List<RuleParamDto> selectParameters(Long ruleId, SqlSession session) {
+ public List<RuleParamDto> selectParameters(Integer ruleId, SqlSession session) {
return getMapper(session).selectParamsForRule(ruleId);
}
@CheckForNull
- public RuleParamDto selectParamByRuleAndKey(Long ruleId, String key, SqlSession session) {
+ public RuleParamDto selectParamByRuleAndKey(Integer ruleId, String key, SqlSession session) {
return getMapper(session).selectParamByRuleAndKey(ruleId, key);
}
import java.util.Date;
public final class RuleDto {
- private Long id;
+ private Integer id;
private String repositoryKey;
private String ruleKey;
private String description;
private Priority priority;
private Cardinality cardinality;
private String language;
- private Long parentId;
+ private Integer parentId;
private Date createdAt;
private Date updatedAt;
private String noteData;
private Date noteCreatedAt;
private Date noteUpdatedAt;
- public Long getId() {
+ public Integer getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(Integer id) {
this.id = id;
}
this.language = language;
}
- public Long getParentId() {
+ public Integer getParentId() {
return parentId;
}
- public void setParentId(Long parentId) {
+ public void setParentId(Integer parentId) {
this.parentId = parentId;
}
List<RuleDto> selectNonManual();
- RuleDto selectById(Long id);
+ RuleDto selectById(Integer id);
void update(RuleDto rule);
List<RuleParamDto> selectAllParams();
- List<RuleParamDto> selectParamsForRule(Long id);
+ List<RuleParamDto> selectParamsForRule(Integer id);
- RuleParamDto selectParamByRuleAndKey(@Param("ruleId") Long ruleId, @Param("key") String key);
+ RuleParamDto selectParamByRuleAndKey(@Param("ruleId") Integer ruleId, @Param("key") String key);
}
public class RuleParamDto {
private int id;
- private Long ruleId;
+ private Integer ruleId;
private String name;
private String type;
private String defaultValue;
return this;
}
- public Long getRuleId() {
+ public Integer getRuleId() {
return ruleId;
}
- public RuleParamDto setRuleId(Long ruleId) {
+ public RuleParamDto setRuleId(Integer ruleId) {
this.ruleId = ruleId;
return this;
}
select <include refid="selectColumns"/> from rules
</select>
- <select id="selectById" parameterType="long" resultType="Rule">
+ <select id="selectById" parameterType="Integer" resultType="Rule">
select <include refid="selectColumns"/> from rules WHERE id=#{id}
</select>
#{priorityOrdinal}, #{cardinality}, #{language}, #{parentId}, #{createdAt}, #{updatedAt})
</insert>
- <delete id="deleteParams" parameterType="long" >
+ <delete id="deleteParams" parameterType="Integer" >
delete from active_rule_parameters where rules_parameter_id=#{id}
</delete>
ActiveRuleDto dto = new ActiveRuleDto()
.setProfileId(1)
- .setRuleId(10L)
+ .setRuleId(10)
.setSeverity(2)
.setInheritance("INHERITED");
ActiveRuleDto dto = new ActiveRuleDto()
.setId(1)
.setProfileId(1)
- .setRuleId(10L)
+ .setRuleId(10)
.setSeverity(4)
.setInheritance(null)
.setNoteData("text");
assertThat(ruleDtos.size()).isEqualTo(1);
RuleDto ruleDto = ruleDtos.get(0);
- assertThat(ruleDto.getId()).isEqualTo(1L);
+ assertThat(ruleDto.getId()).isEqualTo(1);
assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY);
@Test
public void testSelectById() throws Exception {
setupData("selectById");
- RuleDto ruleDto = dao.selectById(2L);
+ RuleDto ruleDto = dao.selectById(2);
- assertThat(ruleDto.getId()).isEqualTo(2L);
+ assertThat(ruleDto.getId()).isEqualTo(2);
assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY);
assertThat(ruleDtos.size()).isEqualTo(1);
RuleDto ruleDto = ruleDtos.get(0);
- assertThat(ruleDto.getId()).isEqualTo(1L);
+ assertThat(ruleDto.getId()).isEqualTo(1);
assertThat(ruleDto.getName()).isEqualTo("Avoid Null");
assertThat(ruleDto.getDescription()).isEqualTo("Should avoid NULL");
assertThat(ruleDto.getStatus()).isEqualTo(Rule.STATUS_READY);
public void testUpdate() {
setupData("update");
RuleDto ruleToUpdate = new RuleDto();
- final long ruleId = 1L;
+ final int ruleId = 1;
String newRuleKey = "NewRuleKey";
String newRepositoryKey = "plugin";
String newName = "new name";
Cardinality newCardinality = Cardinality.MULTIPLE;
String newLanguage = "dart";
Date updatedAt = new Date();
- Long newParentId = 3L;
+ Integer newParentId = 3;
ruleToUpdate.setId(ruleId);
ruleToUpdate.setRuleKey(newRuleKey);
Cardinality newCardinality = Cardinality.MULTIPLE;
String newLanguage = "dart";
Date updatedAt = new Date();
- Long newParentId = 3L;
+ Integer newParentId = 3;
ruleToInsert.setRuleKey(newRuleKey);
ruleToInsert.setRepositoryKey(newRepositoryKey);
assertThat(ruleDtos.size()).isEqualTo(1);
RuleDto insertedRule = ruleDtos.get(0);
// First inserted rule, auto generated ID should be 1
- assertThat(insertedRule.getId()).isEqualTo(1L);
+ assertThat(insertedRule.getId()).isEqualTo(1);
assertThat(insertedRule.getRuleKey()).isEqualTo(newRuleKey);
assertThat(insertedRule.getRepositoryKey()).isEqualTo(newRepositoryKey);
assertThat(insertedRule.getName()).isEqualTo(newName);
List<RuleDto> ruleDtos = dao.selectAll();
assertThat(ruleDtos.size()).isEqualTo(2);
- assertThat(ruleDtos.get(0).getId()).isEqualTo(1L);
- assertThat(ruleDtos.get(1).getId()).isEqualTo(2L);
+ assertThat(ruleDtos.get(0).getId()).isEqualTo(1);
+ assertThat(ruleDtos.get(1).getId()).isEqualTo(2);
}
@Test
@Test
public void testSelectParamsForRule() throws Exception {
setupData("selectParamsForRule");
- long ruleId = 1L;
+ int ruleId = 1;
List<RuleParamDto> ruleDtos = dao.selectParameters(ruleId);
assertThat(ruleDtos.size()).isEqualTo(1);
private ActiveRuleDto newActiveRule(QualityProfileDto qualityProfile, Rule rule, String severity, UserSession userSession, SqlSession session) {
ActiveRuleDto activeRuleDto = new ActiveRuleDto()
.setProfileId(qualityProfile.getId())
- .setRuleId(rule.getId().longValue())
+ .setRuleId(rule.getId())
.setSeverity(Severity.ordinal(severity));
activeRuleDao.insert(activeRuleDto, session);
- List<RuleParamDto> ruleParams = ruleDao.selectParameters(rule.getId().longValue(), session);
+ List<RuleParamDto> ruleParams = ruleDao.selectParameters(rule.getId(), session);
List<ActiveRuleParamDto> activeRuleParams = Lists.newArrayList();
for (RuleParamDto ruleParam : ruleParams) {
ActiveRuleParamDto activeRuleParam = new ActiveRuleParamDto()
private ActiveRuleDto toActiveRuleDto(ActiveRule activeRule, QualityProfileDto dto) {
return new ActiveRuleDto()
.setProfileId(dto.getId())
- .setRuleId(activeRule.getRule().getId().longValue())
+ .setRuleId(activeRule.getRule().getId())
.setSeverity(toSeverityLevel(activeRule.getSeverity()));
}
public QProfileRuleNote activeRuleNote() {
return activeRuleNote;
}
+
+
}
package org.sonar.server.qualityprofile;
public class QProfileRuleParam {
+
private final String key;
private final String value;
private final String description;
private final String defaultValue;
private final String type;
+
public QProfileRuleParam(String key, String value, String description, String defaultValue, String type) {
- super();
this.key = key;
this.value = value;
this.description = description;
this.defaultValue = defaultValue;
this.type = type;
}
+
public String key() {
return key;
}
+
public String value() {
return value;
}
+
public String description() {
return description;
}
+
public String defaultValue() {
return defaultValue;
}
+
public String type() {
return type;
}
// ACTIVE RULES
// deactivate a rule (only E/S indexing)
// update severity (only E/S indexing)
- // update parameter on a active rule
+ // update parameter on a active rule (only E/S indexing)
// add note on an active rule
// delete note on an active rule
// edit note on an active rule
List<RuleParamDto> flatParams = ruleDao.selectParameters();
profiler.stop();
- Multimap<Long, RuleParamDto> paramsByRule = ArrayListMultimap.create();
+ Multimap<Integer, RuleParamDto> paramsByRule = ArrayListMultimap.create();
for (RuleParamDto param : flatParams) {
paramsByRule.put(param.getRuleId(), param);
}
* @param ruleId
*/
public void saveOrUpdate(int ruleId) {
- RuleDto rule = ruleDao.selectById(Long.valueOf(ruleId));
+ RuleDto rule = ruleDao.selectById(ruleId);
Collection<RuleParamDto> params = ruleDao.selectParameters(rule.getId());
try {
searchIndex.putSynchronous(INDEX_RULES, TYPE_RULE, Long.toString(rule.getId()), ruleDocument(rule, params));
}
}
- private void bulkIndex(List<RuleDto> rules, Multimap<Long, RuleParamDto> paramsByRule) throws IOException {
+ private void bulkIndex(List<RuleDto> rules, Multimap<Integer, RuleParamDto> paramsByRule) throws IOException {
String[] ids = new String[rules.size()];
BytesStream[] docs = new BytesStream[rules.size()];
int index = 0;
def update_param
verify_post_request
-
access_denied unless has_role?(:profileadmin)
- require_parameters :profile_id, :param_id, :active_rule_id
- profile = Profile.find(params[:profile_id].to_i)
- rule_param = RulesParameter.find(params[:param_id].to_i)
- active_rule = ActiveRule.find(params[:active_rule_id].to_i)
- # As the active param can be null, we should not raise a RecordNotFound exception when it's not found (as it would be done when using find(:id) function)
- active_param = ActiveRuleParameter.find_by_id(params[:id].to_i) if params[:id].to_i > 0
+ require_parameters :param_id, :active_rule_id, :profile_id
call_backend do
- Internal.quality_profiles.updateActiveRuleParam(params[:active_rule_id].to_i, rule_param.name, params[:value])
+ Internal.quality_profiles.updateActiveRuleParam(params[:active_rule_id].to_i, params[:param_id], params[:value])
end
- #value = params[:value]
- #if value != ""
- # active_param = ActiveRuleParameter.new(:rules_parameter => rule_param, :active_rule => active_rule) if active_param.nil?
- # old_value = active_param.value
- # active_param.value = value
- # if active_param.save! && active_param.valid?
- # active_param.reload
- # java_facade.ruleParamChanged(profile.id, active_rule.id, rule_param.name, old_value, value, current_user.name)
- # end
- #elsif !active_param.nil?
- # old_value = active_param.value
- # active_param.destroy
- # java_facade.ruleParamChanged(profile.id, active_rule.id, rule_param.name, old_value, nil, current_user.name)
- #end
-
- # let's reload the active rule
+ # TODO use a QProfileRule instead of rails objects
+ profile = Profile.find(params[:profile_id].to_i)
active_rule = ActiveRule.find(params[:active_rule_id].to_i)
render :partial => 'rule', :locals => {:profile => profile, :rule => active_rule.rule, :active_rule => active_rule}
end
#
def activate_rule
verify_post_request
+ access_denied unless has_role?(:profileadmin)
require_parameters :id, :rule_id
+ profile = Profile.find(params[:id].to_i)
+ if profile
+ rule=Rule.first(:conditions => ["id = ? and status <> ?", params[:rule_id].to_i, Rule::STATUS_REMOVED])
+ priority=params[:level]
- result = nil
- call_backend do
- severity = params[:level]
- if severity.blank?
+ active_rule=profile.active_by_rule_id(rule.id)
+ if priority.blank?
# deactivate the rule
- result = Internal.quality_profiles.deactivateRule(params[:id].to_i, params[:rule_id].to_i)
+ if active_rule
+ java_facade.ruleDeactivated(profile.id, active_rule.id, current_user.name)
+ active_rule.destroy
+ active_rule=nil
+ end
else
# activate the rule
- result = Internal.quality_profiles.activateRule(params[:id].to_i, params[:rule_id].to_i, severity)
+ activated = false
+ if active_rule.nil?
+ active_rule = ActiveRule.new(:profile_id => profile.id, :rule => rule)
+ rule.parameters.select { |p| p.default_value.present? }.each do |p|
+ active_rule.active_rule_parameters.build(:rules_parameter => p, :value => p.default_value)
+ end
+ activated = true
+ end
+ old_severity = active_rule.failure_level
+ active_rule.failure_level=Sonar::RulePriority.id(priority)
+ active_rule.save!
+ if activated
+ java_facade.ruleActivated(profile.id, active_rule.id, current_user.name)
+ else
+ java_facade.ruleSeverityChanged(profile.id, active_rule.id, old_severity, active_rule.failure_level, current_user.name)
+ end
+ end
+ if active_rule
+ active_rule.reload
end
- end
-
- # Load rails objects needed to the display. Remove this when ui use java objects (existing in the result object) instead of rails objects
- profile = Profile.find(params[:id].to_i)
- rule = Rule.first(:conditions => ["id = ? and status <> ?", params[:rule_id].to_i, Rule::STATUS_REMOVED]) if profile
- activate_rule_id = result.rule.activeRuleId().to_i if result
- active_rule = ActiveRule.first(:conditions => ['id = ?', activate_rule_id]) if activate_rule_id
- render :update do |page|
- page.replace_html("rule_#{rule.id}", :partial => 'rule', :object => rule, :locals => {:profile => profile, :rule => rule, :active_rule => active_rule})
- page.assign('localModifications', true)
+ render :update do |page|
+ page.replace_html("rule_#{rule.id}", :partial => 'rule', :object => rule, :locals => {:profile => profile, :rule => rule, :active_rule => active_rule})
+ page.assign('localModifications', true)
+ end
end
end
# As the active param can be null, we should not raise a RecordNotFound exception when it's not found (as it would be done when using find(:id) function)
active_param = ActiveRuleParameter.find_by_id(params[:id].to_i) if params[:id].to_i > 0
- call_backend do
- Internal.quality_profiles.updateActiveRuleParam(params[:active_rule_id].to_i, rule_param.name, params[:value])
+ value = params[:value]
+ if value != ""
+ active_param = ActiveRuleParameter.new(:rules_parameter => rule_param, :active_rule => active_rule) if active_param.nil?
+ old_value = active_param.value
+ active_param.value = value
+ if active_param.save! && active_param.valid?
+ active_param.reload
+ java_facade.ruleParamChanged(profile.id, active_rule.id, rule_param.name, old_value, value, current_user.name)
+ end
+ elsif !active_param.nil?
+ old_value = active_param.value
+ active_param.destroy
+ java_facade.ruleParamChanged(profile.id, active_rule.id, rule_param.name, old_value, nil, current_user.name)
end
-
-
- #value = params[:value]
- #if value != ""
- # active_param = ActiveRuleParameter.new(:rules_parameter => rule_param, :active_rule => active_rule) if active_param.nil?
- # old_value = active_param.value
- # active_param.value = value
- # if active_param.save! && active_param.valid?
- # active_param.reload
- # java_facade.ruleParamChanged(profile.id, active_rule.id, rule_param.name, old_value, value, current_user.name)
- # end
- #elsif !active_param.nil?
- # old_value = active_param.value
- # active_param.destroy
- # java_facade.ruleParamChanged(profile.id, active_rule.id, rule_param.name, old_value, nil, current_user.name)
- #end
# let's reload the active rule
active_rule = ActiveRule.find(params[:active_rule_id].to_i)
render :partial => 'rule', :locals => {:profile => profile, :rule => active_rule.rule, :active_rule => active_rule}
QualityProfileDto qualityProfile = new QualityProfileDto().setId(1).setName("My profile").setLanguage("java");
Rule rule = Rule.create().setRepositoryKey("squid").setKey("AvoidCycle");
rule.setId(10);
- when(ruleDao.selectParameters(eq(10L), eq(session))).thenReturn(newArrayList(new RuleParamDto().setId(20).setName("max").setDefaultValue("10")));
+ when(ruleDao.selectParameters(eq(10), eq(session))).thenReturn(newArrayList(new RuleParamDto().setId(20).setName("max").setDefaultValue("10")));
when(profileRules.getFromActiveRuleId(anyInt())).thenReturn(mock(QProfileRule.class));
RuleActivationResult result = operations.activateRule(qualityProfile, rule, Severity.CRITICAL, MockUserSession.create().setName("nicolas").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN));
QualityProfileDto qualityProfile = new QualityProfileDto().setId(1).setName("My profile").setLanguage("java");
Rule rule = Rule.create().setRepositoryKey("squid").setKey("AvoidCycle");
rule.setId(10);
- ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10L).setSeverity(1);
+ ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10).setSeverity(1);
when(activeRuleDao.selectByProfileAndRule(1, 10)).thenReturn(activeRule);
when(profileRules.getFromActiveRuleId(anyInt())).thenReturn(mock(QProfileRule.class));
QualityProfileDto qualityProfile = new QualityProfileDto().setId(1).setName("My profile").setLanguage("java");
Rule rule = Rule.create().setRepositoryKey("squid").setKey("AvoidCycle");
rule.setId(10);
- ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10L).setSeverity(1);
+ ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10).setSeverity(1);
when(activeRuleDao.selectByProfileAndRule(1, 10)).thenReturn(activeRule);
when(profileRules.getFromRuleId(anyInt())).thenReturn(mock(QProfileRule.class));
@Test
public void update_active_rule_param() throws Exception {
- ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10L).setSeverity(1);
+ ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10).setSeverity(1);
ActiveRuleParamDto activeRuleParam = new ActiveRuleParamDto().setId(100).setActiveRuleId(5).setKey("max").setValue("20");
operations.updateActiveRuleParam(activeRule, activeRuleParam, "30", MockUserSession.create().setName("nicolas").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN));
@Test
public void remove_active_rule_param() throws Exception {
- ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10L).setSeverity(1);
+ ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10).setSeverity(1);
ActiveRuleParamDto activeRuleParam = new ActiveRuleParamDto().setId(100).setActiveRuleId(5).setKey("max").setValue("20");
operations.deleteActiveRuleParam(activeRule, activeRuleParam, MockUserSession.create().setName("nicolas").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN));
@Test
public void create_active_rule_param() throws Exception {
- ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10L).setSeverity(1);
-// when(activeRuleDao.selectParamByActiveRuleAndKey(5, "max", session)).thenReturn(null);
-
- RuleParamDto ruleParam = new RuleParamDto().setRuleId(10L).setName("max").setDefaultValue("20");
- when(ruleDao.selectParamByRuleAndKey(10L, "max", session)).thenReturn(ruleParam);
+ ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10).setSeverity(1);
+ RuleParamDto ruleParam = new RuleParamDto().setRuleId(10).setName("max").setDefaultValue("20");
+ when(ruleDao.selectParamByRuleAndKey(10, "max", session)).thenReturn(ruleParam);
operations.createActiveRuleParam(activeRule, "max", "30", MockUserSession.create().setName("nicolas").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN));
@Test
public void fail_to_create_active_rule_if_no_rule_param() throws Exception {
- ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10L).setSeverity(1);
-// when(activeRuleDao.selectParamByActiveRuleAndKey(5, "max", session)).thenReturn(null);
- when(ruleDao.selectParamByRuleAndKey(10L, "max", session)).thenReturn(null);
+ ActiveRuleDto activeRule = new ActiveRuleDto().setId(5).setProfileId(1).setRuleId(10).setSeverity(1);
+ when(ruleDao.selectParamByRuleAndKey(10, "max", session)).thenReturn(null);
try {
operations.createActiveRuleParam(activeRule, "max", "30", MockUserSession.create().setName("nicolas").setGlobalPermissions(GlobalPermissions.QUALITY_PROFILE_ADMIN));
fail();
public void fail_to_activate_rule_if_rule_not_found() throws Exception {
QualityProfileDto qualityProfile = new QualityProfileDto().setId(1).setName("My profile").setLanguage("java");
when(qualityProfileDao.selectById(1)).thenReturn(qualityProfile);
- Rule rule = Rule.create().setRepositoryKey("squid").setKey("AvoidCycle");
- rule.setId(10);
- when(ruleFinder.findById(10)).thenReturn(null);
+ QProfileRule rule = mock(QProfileRule.class);
+ when(rule.id()).thenReturn(10);
+ when(rules.getFromRuleId(10)).thenReturn(null);
try {
qProfiles.activateRule(1, 10, Severity.BLOCKER);
@Test
public void should_index_all_rules() {
- long ruleId1 = 3L;
+ int ruleId1 = 3;
RuleDto rule1 = new RuleDto();
rule1.setRepositoryKey("repo");
rule1.setRuleKey("key1");
rule1.setId(ruleId1);
rule1.setNoteData("noteData");
rule1.setNoteUserLogin("userLogin");
- long ruleId2 = 4L;
+ int ruleId2 = 4;
RuleDto rule2 = new RuleDto();
rule2.setRepositoryKey("repo");
rule2.setRuleKey("key2");
rule.setRepositoryKey("repo");
rule.setRuleKey("key");
int id = 3;
- rule.setId((long) id);
- when(ruleDao.selectById((long) id)).thenReturn(rule);
+ rule.setId(id);
+ when(ruleDao.selectById(id)).thenReturn(rule);
registry.saveOrUpdate(id);
assertThat(registry.findIds(ImmutableMap.of("repositoryKey", "repo"))).hasSize(1);
rule.setName("polop");
@Test
public void should_update_existing_rules_and_forget_deleted_rules() {
- long ruleId1 = 1L;
+ int ruleId1 = 1;
RuleDto rule1 = new RuleDto();
rule1.setRepositoryKey("xoo");
rule1.setRuleKey("key1");
rule1.setId(ruleId1);
- long ruleId2 = 2L;
+ int ruleId2 = 2;
RuleDto rule2 = new RuleDto();
rule2.setRepositoryKey("xoo");
rule2.setRuleKey("key2");
@Test
public void bulk_index_active_rules() throws IOException {
- List<ActiveRuleDto> activeRules = newArrayList(new ActiveRuleDto().setId(1).setProfileId(10).setRuleId(1L).setSeverity(2));
+ List<ActiveRuleDto> activeRules = newArrayList(new ActiveRuleDto().setId(1).setProfileId(10).setRuleId(1).setSeverity(2));
Multimap<Integer, ActiveRuleParamDto> paramsByActiveRule = ArrayListMultimap.create();
paramsByActiveRule.putAll(1, newArrayList(new ActiveRuleParamDto().setId(1).setActiveRuleId(1).setRulesParameterId(1).setKey("key").setValue("RuleWithParameters")));
@Test
public void save_active_rule() throws IOException {
- ActiveRuleDto activeRule = new ActiveRuleDto().setId(1).setProfileId(10).setRuleId(1L).setSeverity(2);
+ ActiveRuleDto activeRule = new ActiveRuleDto().setId(1).setProfileId(10).setRuleId(1).setSeverity(2);
ArrayList<ActiveRuleParamDto> params = newArrayList(new ActiveRuleParamDto().setId(1).setActiveRuleId(1).setRulesParameterId(1).setKey("key").setValue("RuleWithParameters"));
registry.save(activeRule, params);