diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-06-12 13:02:08 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2015-06-12 13:27:33 +0200 |
| commit | feb739fe04ecbcff34d8c693fd2d265e4d228dc7 (patch) | |
| tree | 2150bcb8ce56edfb8cafc7ea4eb47bf33f2a188d | |
| parent | 8b2d7004730d5b05497c79b13dfc0742350105b9 (diff) | |
| download | sonarqube-feb739fe04ecbcff34d8c693fd2d265e4d228dc7.tar.gz sonarqube-feb739fe04ecbcff34d8c693fd2d265e4d228dc7.zip | |
SONAR-6588 Apply Feedback from PR (2)
2 files changed, 4 insertions, 8 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolder.java index 2346a3a04bf..c79b7cb2860 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolder.java @@ -21,7 +21,6 @@ package org.sonar.server.computation.debt; import com.google.common.base.Optional; -import java.util.Collection; import java.util.Set; public interface DebtModelHolder { @@ -45,7 +44,6 @@ public interface DebtModelHolder { * * @throws IllegalStateException if the holder is empty */ - Collection<Characteristic> findSubCharacteristicsByRootKey(String rootCharacteristicKey); - + Set<Characteristic> findSubCharacteristicsByRootKey(String rootCharacteristicKey); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolderImpl.java index 04ef0015ed7..6d0e0d1fbf1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/debt/DebtModelHolderImpl.java @@ -22,10 +22,8 @@ package org.sonar.server.computation.debt; import com.google.common.base.Optional; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -61,13 +59,13 @@ public class DebtModelHolderImpl implements MutableDebtModelHolder { } @Override - public Collection<Characteristic> findSubCharacteristicsByRootKey(String rootCharacteristicKey) { + public Set<Characteristic> findSubCharacteristicsByRootKey(String rootCharacteristicKey) { checkCharacteristicsAreInitialized(); Characteristic rootCharacteristic = characteristicByKey.get(rootCharacteristicKey); if (rootCharacteristic == null) { - return Collections.emptyList(); + return Collections.emptySet(); } - return ImmutableList.copyOf(subCharacteristicsByRootCharacteristic.get(rootCharacteristic)); + return ImmutableSet.copyOf(subCharacteristicsByRootCharacteristic.get(rootCharacteristic)); } @Override |