diff options
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 c96674fd8b5..ad2ec8007b8 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 execute(TimeMachineQuery query, boolean selectAllFields, Set<Integer> metricIds) { + protected List<Object[]> 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 d7f7211feb9..5c53ad77e68 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 Object selectOne(String statement) { + public <T> T selectOne(String statement) { reset(); return session.selectOne(statement); } - public Object selectOne(String statement, Object parameter) { + public <T> T selectOne(String statement, Object parameter) { reset(); return session.selectOne(statement, parameter); } - public List selectList(String statement) { + public <T> List<T> selectList(String statement) { reset(); return session.selectList(statement); } - public List selectList(String statement, Object parameter) { + public <T> List<T> selectList(String statement, Object parameter) { reset(); return session.selectList(statement, parameter); } - public List selectList(String statement, Object parameter, RowBounds rowBounds) { + public <T> List<T> selectList(String statement, Object parameter, RowBounds rowBounds) { reset(); return session.selectList(statement, parameter, rowBounds); } - public Map selectMap(String statement, String mapKey) { + public <K, V> Map<K, V> selectMap(String statement, String mapKey) { reset(); return session.selectMap(statement, mapKey); } - public Map selectMap(String statement, Object parameter, String mapKey) { + public <K, V> Map<K, V> selectMap(String statement, Object parameter, String mapKey) { reset(); return session.selectMap(statement, parameter, mapKey); } - public Map selectMap(String statement, Object parameter, String mapKey, RowBounds rowBounds) { + public <K, V> Map<K, V> 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 6666e4dabf8..2d9ae8ca20a 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); } |