SONAR-10308 use java.util.Optional in RuleRepository

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java
index cde7688cbd7ee1b29f1624b28d67fad13d8cceef..8bf1e494d196b3d2e4556fad5c90a7cccb8865c7 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepository.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.server.computation.task.projectanalysis.issue;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
 import org.sonar.api.rule.RuleKey;
 
 /**

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java
index a7698d48162a29f03580de9eeca9a06b0a477ead..347cea214d042d6df76d6e71417fb82de2b2dce6 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImpl.java
@@ -19,10 +19,10 @@
  */
 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;
@@ -67,7 +67,7 @@ public class RuleRepositoryImpl implements RuleRepository {
 
     ensureInitialized();
 
-    return Optional.fromNullable(rulesByKey.get(key));
+    return Optional.ofNullable(rulesByKey.get(key));
   }
 
   @Override
@@ -83,7 +83,7 @@ public class RuleRepositoryImpl implements RuleRepository {
   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) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java
index ed5277d4674650dead691b8b403aaade32a4bbe9..f0ab906b52699b5d19c98d96c55cb5e238fb9867 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStep.java
@@ -19,11 +19,11 @@
  */
 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;

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java
index d673c0e7560e1f06403d341da43a30dfbb8a09ac..0102edffc4bdd2efeed7d9a9b5e912db41020f72 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryImplTest.java
@@ -19,9 +19,9 @@
  */
 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;
@@ -36,7 +36,6 @@ import org.sonar.db.rule.RuleDto;
 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;
@@ -203,7 +202,7 @@ public class RuleRepositoryImplTest {
   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
@@ -224,7 +223,7 @@ public class RuleRepositoryImplTest {
   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
@@ -246,7 +245,7 @@ public class RuleRepositoryImplTest {
   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

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java
index 5b76e34591cd227324ec0cb9bd9a82857d96c440..52939ddb8f520c2aadc6cd77a5328d9d17992707 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleRepositoryRule.java
@@ -19,9 +19,9 @@
  */
 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;
 
@@ -55,12 +55,12 @@ public class RuleRepositoryRule extends ExternalResource implements RuleReposito
 
   @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) {