diff options
| author | David Gageot <david@gageot.net> | 2012-05-23 08:19:35 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2012-05-23 08:19:35 +0200 |
| commit | d7d95106d0e46906477da9c7f93be156823d7bce (patch) | |
| tree | c127910d4f0ded6168c0bbfefdfc59b05593997a /sonar-plugin-api | |
| parent | 67b5de980cb96e1a500f87db8997fee49ba1556d (diff) | |
| download | sonarqube-d7d95106d0e46906477da9c7f93be156823d7bce.tar.gz sonarqube-d7d95106d0e46906477da9c7f93be156823d7bce.zip | |
Remove warnings
Diffstat (limited to 'sonar-plugin-api')
| -rw-r--r-- | sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java | 6 | ||||
| -rw-r--r-- | sonar-plugin-api/src/test/java/org/sonar/api/batch/DefaultFormulaDataTest.java | 27 |
2 files changed, 18 insertions, 15 deletions
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java index d49a7001028..1f2eedc3631 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/BatchExtensionDictionnary.java @@ -199,7 +199,7 @@ public class BatchExtensionDictionnary { return Phase.Name.DEFAULT; } - private void evaluateMethod(Object extension, Method method, List results) { + private void evaluateMethod(Object extension, Method method, List<Object> results) { try { Object result = method.invoke(extension); if (result != null) { @@ -207,8 +207,8 @@ public class BatchExtensionDictionnary { if (result instanceof Class) { results.addAll(componentContainer.getComponentsByType((Class) result)); - } else if (result instanceof Collection) { - results.addAll((Collection) result); + } else if (result instanceof Collection<?>) { + results.addAll((Collection<?>) result); } else { results.add(result); diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/DefaultFormulaDataTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/DefaultFormulaDataTest.java index b3d90477d53..f3fd0079ac1 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/DefaultFormulaDataTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/DefaultFormulaDataTest.java @@ -19,16 +19,19 @@ */ package org.sonar.api.batch; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; import org.junit.Test; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Mockito.*; import org.sonar.api.measures.MeasuresFilter; import org.sonar.api.measures.Metric; import java.util.Arrays; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class DefaultFormulaDataTest { @Test @@ -36,17 +39,17 @@ public class DefaultFormulaDataTest { DecoratorContext context = mock(DecoratorContext.class); DefaultFormulaData data = new DefaultFormulaData(context); - data.getChildrenMeasures((MeasuresFilter) anyObject()); - verify(context).getChildrenMeasures((MeasuresFilter) anyObject()); + data.getChildrenMeasures(any(MeasuresFilter.class)); + verify(context).getChildrenMeasures(any(MeasuresFilter.class)); - data.getChildrenMeasures((Metric) anyObject()); - verify(context).getChildrenMeasures((Metric) anyObject()); + data.getChildrenMeasures(any(Metric.class)); + verify(context).getChildrenMeasures(any(Metric.class)); - data.getMeasures((MeasuresFilter) anyObject()); - verify(context).getMeasures((MeasuresFilter) anyObject()); + data.getMeasures(any(MeasuresFilter.class)); + verify(context).getMeasures(any(MeasuresFilter.class)); - data.getMeasure((Metric) anyObject()); - verify(context).getMeasure((Metric) anyObject()); + data.getMeasure(any(Metric.class)); + verify(context).getMeasure(any(Metric.class)); } @Test |