diff options
Diffstat (limited to 'sonar-server')
3 files changed, 3 insertions, 4 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/filters/FilterResult.java b/sonar-server/src/main/java/org/sonar/server/filters/FilterResult.java index a09a3dcfd29..421e53f138e 100644 --- a/sonar-server/src/main/java/org/sonar/server/filters/FilterResult.java +++ b/sonar-server/src/main/java/org/sonar/server/filters/FilterResult.java @@ -30,7 +30,7 @@ public class FilterResult { public static final int SORTED_COLUMN_INDEX = 3; public FilterResult(Filter filter, List rows) { - this.rows = new ArrayList(rows); + this.rows = new ArrayList<Object[]>(rows); this.filter = filter; } diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 65ef210a2cb..a7b5b34efbd 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -362,7 +362,7 @@ public final class JRubyFacade { } try { - Class aClass = Class.forName(className); + Class<?> aClass = Class.forName(className); return getContainer().getComponentByType(aClass); } catch (ClassNotFoundException e) { @@ -374,7 +374,7 @@ public final class JRubyFacade { public Object getComponentByClassname(String pluginKey, String className) { Object component = null; ComponentContainer container = getContainer(); - Class componentClass = container.getComponentByType(DefaultServerPluginRepository.class).getClass(pluginKey, className); + Class<?> componentClass = container.getComponentByType(DefaultServerPluginRepository.class).getClass(pluginKey, className); if (componentClass != null) { component = container.getComponentByType(componentClass); } diff --git a/sonar-server/src/test/java/org/sonar/server/platform/ServletFiltersTest.java b/sonar-server/src/test/java/org/sonar/server/platform/ServletFiltersTest.java index c6a715c0696..6070b4891bf 100644 --- a/sonar-server/src/test/java/org/sonar/server/platform/ServletFiltersTest.java +++ b/sonar-server/src/test/java/org/sonar/server/platform/ServletFiltersTest.java @@ -22,7 +22,6 @@ package org.sonar.server.platform; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.mockito.InOrder; import org.sonar.api.web.ServletFilter; import javax.servlet.*; |