*/
package org.sonar.server.computation.task.projectanalysis.issue;
-import com.google.common.base.Optional;
+import java.util.Optional;
import org.sonar.api.rule.RuleKey;
/**
*/
package org.sonar.server.computation.task.projectanalysis.issue;
-import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
import java.util.Map;
+import java.util.Optional;
import javax.annotation.CheckForNull;
import org.sonar.api.rule.RuleKey;
import org.sonar.core.util.stream.MoreCollectors;
ensureInitialized();
- return Optional.fromNullable(rulesByKey.get(key));
+ return Optional.ofNullable(rulesByKey.get(key));
}
@Override
public Optional<Rule> findById(int id) {
ensureInitialized();
- return Optional.fromNullable(rulesById.get(id));
+ return Optional.ofNullable(rulesById.get(id));
}
private static void verifyKeyArgument(RuleKey key) {
*/
package org.sonar.server.computation.task.projectanalysis.step;
-import com.google.common.base.Optional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import org.sonar.api.rule.RuleKey;
import org.sonar.api.rule.RuleStatus;
import org.sonar.core.util.CloseableIterator;
*/
package org.sonar.server.computation.task.projectanalysis.issue;
-import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.sonar.server.computation.task.projectanalysis.analysis.AnalysisMetadataHolderRule;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.guava.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.eq;
public void findByKey_returns_absent_if_rule_does_not_exist_in_DB() {
Optional<Rule> rule = underTest.findByKey(AC_RULE_KEY);
- assertThat(rule).isAbsent();
+ assertThat(rule).isEmpty();
}
@Test
public void findByKey_returns_empty_if_argument_is_deprecated_key_in_DB_of_rule_in_DB() {
Optional<Rule> rule = underTest.findByKey(DEPRECATED_KEY_OF_NON_EXITING_RULE);
- assertThat(rule).isAbsent();
+ assertThat(rule).isEmpty();
}
@Test
public void findById_returns_absent_if_rule_does_not_exist_in_DB() {
Optional<Rule> rule = underTest.findById(AC_RULE_ID);
- assertThat(rule).isAbsent();
+ assertThat(rule).isEmpty();
}
@Test
*/
package org.sonar.server.computation.task.projectanalysis.issue;
-import com.google.common.base.Optional;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import org.junit.rules.ExternalResource;
import org.sonar.api.rule.RuleKey;
@Override
public Optional<Rule> findByKey(RuleKey key) {
- return Optional.fromNullable(rulesByKey.get(requireNonNull(key)));
+ return Optional.ofNullable(rulesByKey.get(requireNonNull(key)));
}
@Override
public Optional<Rule> findById(int id) {
- return Optional.fromNullable(rulesById.get(id));
+ return Optional.ofNullable(rulesById.get(id));
}
public DumbRule add(RuleKey key) {