summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Gageot <david@gageot.net>2012-07-17 08:27:45 +0200
committerDavid Gageot <david@gageot.net>2012-07-17 08:27:45 +0200
commit99ab43da7e1c0860654cb99af5b740cf3480b685 (patch)
treeceee7c3aed2b615254cc9bce0f9482707b218967
parent0beb403f5df390aeb04291f30ae05388131235df (diff)
downloadsonarqube-99ab43da7e1c0860654cb99af5b740cf3480b685.tar.gz
sonarqube-99ab43da7e1c0860654cb99af5b740cf3480b685.zip
Revert "Remove warning"
This reverts commit a15e8577ff0f4b9e88cdf78e6aaed3ebd6259c50.
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/DefaultTimeMachine.java2
-rw-r--r--sonar-core/src/main/java/org/sonar/core/persistence/BatchSession.java16
-rw-r--r--sonar-squid/src/main/java/org/sonar/squid/Squid.java2
3 files changed, 10 insertions, 10 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/DefaultTimeMachine.java b/sonar-batch/src/main/java/org/sonar/batch/DefaultTimeMachine.java
index ad2ec8007b8..c96674fd8b5 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/DefaultTimeMachine.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/DefaultTimeMachine.java
@@ -73,7 +73,7 @@ public class DefaultTimeMachine implements TimeMachine {
return rows;
}
- protected List<Object[]> execute(TimeMachineQuery query, boolean selectAllFields, Set<Integer> metricIds) {
+ protected List execute(TimeMachineQuery query, boolean selectAllFields, Set<Integer> metricIds) {
Resource resource = query.getResource();
if (resource != null && resource.getId() == null) {
resource = index.getResource(query.getResource());
diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/BatchSession.java b/sonar-core/src/main/java/org/sonar/core/persistence/BatchSession.java
index 5c53ad77e68..d7f7211feb9 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/BatchSession.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/BatchSession.java
@@ -59,42 +59,42 @@ public final class BatchSession implements SqlSession {
session.select(statement, handler);
}
- public <T> T selectOne(String statement) {
+ public Object selectOne(String statement) {
reset();
return session.selectOne(statement);
}
- public <T> T selectOne(String statement, Object parameter) {
+ public Object selectOne(String statement, Object parameter) {
reset();
return session.selectOne(statement, parameter);
}
- public <T> List<T> selectList(String statement) {
+ public List selectList(String statement) {
reset();
return session.selectList(statement);
}
- public <T> List<T> selectList(String statement, Object parameter) {
+ public List selectList(String statement, Object parameter) {
reset();
return session.selectList(statement, parameter);
}
- public <T> List<T> selectList(String statement, Object parameter, RowBounds rowBounds) {
+ public List selectList(String statement, Object parameter, RowBounds rowBounds) {
reset();
return session.selectList(statement, parameter, rowBounds);
}
- public <K, V> Map<K, V> selectMap(String statement, String mapKey) {
+ public Map selectMap(String statement, String mapKey) {
reset();
return session.selectMap(statement, mapKey);
}
- public <K, V> Map<K, V> selectMap(String statement, Object parameter, String mapKey) {
+ public Map selectMap(String statement, Object parameter, String mapKey) {
reset();
return session.selectMap(statement, parameter, mapKey);
}
- public <K, V> Map<K, V> selectMap(String statement, Object parameter, String mapKey, RowBounds rowBounds) {
+ public Map selectMap(String statement, Object parameter, String mapKey, RowBounds rowBounds) {
reset();
return session.selectMap(statement, parameter, mapKey, rowBounds);
}
diff --git a/sonar-squid/src/main/java/org/sonar/squid/Squid.java b/sonar-squid/src/main/java/org/sonar/squid/Squid.java
index 2d9ae8ca20a..6666e4dabf8 100644
--- a/sonar-squid/src/main/java/org/sonar/squid/Squid.java
+++ b/sonar-squid/src/main/java/org/sonar/squid/Squid.java
@@ -108,7 +108,7 @@ public class Squid implements DirectedGraphAccessor<SourceCode, SourceCodeEdge>,
return project;
}
- private void addToPicocontainer(Class<?> classToExpose) {
+ private void addToPicocontainer(Class classToExpose) {
if (pico.getComponent(classToExpose) == null) {
pico.addComponent(classToExpose);
}