aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorDavid Gageot <david@gageot.net>2012-05-14 12:24:30 +0200
committerDavid Gageot <david@gageot.net>2012-05-14 13:01:11 +0200
commitc5d1b2b0665adf51abf4a448df7d1555ffed8e20 (patch)
treec223cccf5c1af54b00007b00326c9648dad080d5 /sonar-server
parentd4176679d0944757b447ca0213cd9de0dfc413ab (diff)
downloadsonarqube-c5d1b2b0665adf51abf4a448df7d1555ffed8e20.tar.gz
sonarqube-c5d1b2b0665adf51abf4a448df7d1555ffed8e20.zip
Fix warnings
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/filters/FilterResult.java2
-rw-r--r--sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java4
-rw-r--r--sonar-server/src/test/java/org/sonar/server/platform/ServletFiltersTest.java1
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.*;