*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.issue.commonrule; | package org.sonar.ce.task.projectanalysis.issue.commonrule; | ||||
import com.google.common.base.Optional; | |||||
import java.util.Optional; | |||||
import javax.annotation.CheckForNull; | import javax.annotation.CheckForNull; | ||||
import org.sonar.api.rule.RuleKey; | import org.sonar.api.rule.RuleKey; | ||||
import org.sonar.ce.task.projectanalysis.component.Component; | import org.sonar.ce.task.projectanalysis.component.Component; | ||||
import org.sonar.core.issue.DefaultIssue; | |||||
import org.sonar.ce.task.projectanalysis.component.Component; | |||||
import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; | import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; | ||||
import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; | import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRulesHolder; | ||||
import org.sonar.core.issue.DefaultIssue; | |||||
import static org.apache.commons.lang.StringUtils.isNotBlank; | import static org.apache.commons.lang.StringUtils.isNotBlank; | ||||
import static org.sonar.server.rule.CommonRuleKeys.commonRepositoryForLang; | import static org.sonar.server.rule.CommonRuleKeys.commonRepositoryForLang; |
*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.qualityprofile; | package org.sonar.ce.task.projectanalysis.qualityprofile; | ||||
import com.google.common.base.Optional; | |||||
import java.util.Optional; | |||||
import org.sonar.api.rule.RuleKey; | import org.sonar.api.rule.RuleKey; | ||||
public interface ActiveRulesHolder { | public interface ActiveRulesHolder { |
*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.qualityprofile; | package org.sonar.ce.task.projectanalysis.qualityprofile; | ||||
import com.google.common.base.Optional; | |||||
import com.google.common.collect.ImmutableMap; | import com.google.common.collect.ImmutableMap; | ||||
import java.util.Collection; | import java.util.Collection; | ||||
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Optional; | |||||
import org.sonar.api.rule.RuleKey; | import org.sonar.api.rule.RuleKey; | ||||
import static com.google.common.base.Preconditions.checkState; | import static com.google.common.base.Preconditions.checkState; | ||||
@Override | @Override | ||||
public Optional<ActiveRule> get(RuleKey ruleKey) { | public Optional<ActiveRule> get(RuleKey ruleKey) { | ||||
checkState(activeRulesByKey != null, "Active rules have not been initialized yet"); | checkState(activeRulesByKey != null, "Active rules have not been initialized yet"); | ||||
return Optional.fromNullable(activeRulesByKey.get(ruleKey)); | |||||
return Optional.ofNullable(activeRulesByKey.get(ruleKey)); | |||||
} | } | ||||
public Collection<ActiveRule> getAll() { | public Collection<ActiveRule> getAll() { |
*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.issue; | package org.sonar.ce.task.projectanalysis.issue; | ||||
import com.google.common.base.Optional; | |||||
import java.util.Date; | import java.util.Date; | ||||
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Optional; | |||||
import org.junit.Before; | import org.junit.Before; | ||||
import org.junit.Test; | import org.junit.Test; | ||||
import org.junit.rules.ExpectedException; | import org.junit.rules.ExpectedException; | ||||
when(ruleRepository.findByKey(ruleKey)).thenReturn(java.util.Optional.of(rule)); | when(ruleRepository.findByKey(ruleKey)).thenReturn(java.util.Optional.of(rule)); | ||||
when(activeRulesHolder.get(any(RuleKey.class))) | when(activeRulesHolder.get(any(RuleKey.class))) | ||||
.thenReturn(Optional.absent()); | |||||
.thenReturn(Optional.empty()); | |||||
when(activeRulesHolder.get(ruleKey)) | when(activeRulesHolder.get(ruleKey)) | ||||
.thenReturn(Optional.of(activeRule)); | .thenReturn(Optional.of(activeRule)); | ||||
when(issue.getRuleKey()) | when(issue.getRuleKey()) |
*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.qualityprofile; | package org.sonar.ce.task.projectanalysis.qualityprofile; | ||||
import com.google.common.base.Optional; | |||||
import java.util.Collections; | import java.util.Collections; | ||||
import java.util.Optional; | |||||
import org.junit.Rule; | import org.junit.Rule; | ||||
import org.junit.Test; | import org.junit.Test; | ||||
import org.junit.rules.ExpectedException; | import org.junit.rules.ExpectedException; |
*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.qualityprofile; | package org.sonar.ce.task.projectanalysis.qualityprofile; | ||||
import com.google.common.base.Optional; | |||||
import java.util.HashMap; | import java.util.HashMap; | ||||
import java.util.Map; | import java.util.Map; | ||||
import java.util.Optional; | |||||
import org.junit.rules.ExternalResource; | import org.junit.rules.ExternalResource; | ||||
import org.sonar.api.rule.RuleKey; | import org.sonar.api.rule.RuleKey; | ||||
@Override | @Override | ||||
public Optional<ActiveRule> get(RuleKey ruleKey) { | public Optional<ActiveRule> get(RuleKey ruleKey) { | ||||
return Optional.fromNullable(activeRulesByKey.get(ruleKey)); | |||||
return Optional.ofNullable(activeRulesByKey.get(ruleKey)); | |||||
} | } | ||||
public ActiveRulesHolderRule put(ActiveRule activeRule) { | public ActiveRulesHolderRule put(ActiveRule activeRule) { |
*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.qualityprofile; | package org.sonar.ce.task.projectanalysis.qualityprofile; | ||||
import com.google.common.base.Optional; | |||||
import java.util.Optional; | |||||
import org.sonar.api.rule.RuleKey; | import org.sonar.api.rule.RuleKey; | ||||
import org.sonar.api.rule.Severity; | import org.sonar.api.rule.Severity; | ||||
*/ | */ | ||||
package org.sonar.ce.task.projectanalysis.step; | package org.sonar.ce.task.projectanalysis.step; | ||||
import com.google.common.base.Optional; | |||||
import java.util.Optional; | |||||
import org.assertj.core.data.MapEntry; | import org.assertj.core.data.MapEntry; | ||||
import org.junit.Rule; | import org.junit.Rule; | ||||
import org.junit.Test; | import org.junit.Test; |