Revert "Remove warning"

This reverts commit a15e8577ff0f4b9e88cdf78e6aaed3ebd6259c50.

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 ad2ec8007b8f177bae84758e68ded4b2836a766e..c96674fd8b5fbfcfd13107d371c4b2d76a75f21c 100644 (file)
--- 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 5c53ad77e6833571ffeb1c4cc38eb9914ecb974d..d7f7211feb9ae66aa0b028bc1dc8d6f3d2dee61a 100644 (file)
--- 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 2d9ae8ca20ad86cdd7ab3ed5f72f8b36d9150343..6666e4dabf8ea23817cb63f7dd0c46f594b6a91e 100644 (file)
--- 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);
     }