SONAR-4617 Refactoring away from Resource<T>

3 files changed, 9 insertions, 9 deletions

diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java
index 4336afa0a74..28604e52bc2 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarBridgeEngine.java
@@ -93,7 +93,7 @@ public class SonarBridgeEngine extends CpdEngine {
     TokenizerBridge bridge = new TokenizerBridge(mapping.getTokenizer(), fileSystem.sourceCharset().name(), getBlockSize(project));
     for (File file : sourceFiles) {
       LOG.debug("Populating index from {}", file);
-      Resource<?> resource = mapping.createResource(file, fileSystem.sourceDirs());
+      Resource resource = mapping.createResource(file, fileSystem.sourceDirs());
       String resourceId = SonarEngine.getFullKey(project, resource);
       List<Block> blocks = bridge.chunk(resourceId, file);
       index.insert(resource, blocks);
@@ -106,7 +106,7 @@ public class SonarBridgeEngine extends CpdEngine {
     try {
       for (File file : sourceFiles) {
         LOG.debug("Detection of duplications for {}", file);
-        Resource<?> resource = mapping.createResource(file, fileSystem.sourceDirs());
+        Resource resource = mapping.createResource(file, fileSystem.sourceDirs());
         String resourceKey = SonarEngine.getFullKey(project, resource);
 
         Collection<Block> fileBlocks = index.getByResource(resource, resourceKey);
diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java
index 4d9cf3bade5..48ff0147243 100644
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/SonarEngine.java
@@ -89,7 +89,7 @@ public class SonarEngine extends CpdEngine {
     return Java.KEY.equals(language.getKey());
   }
 
-  static String getFullKey(Project project, Resource<?> resource) {
+  static String getFullKey(Project project, Resource resource) {
     return new StringBuilder(ResourceModel.KEY_SIZE)
         .append(project.getKey())
         .append(':')
@@ -118,7 +118,7 @@ public class SonarEngine extends CpdEngine {
 
     for (File file : sourceFiles) {
       LOG.debug("Populating index from {}", file);
-      Resource<?> resource = getResource(file);
+      Resource resource = getResource(file);
       String resourceKey = getFullKey(project, resource);
 
       List<Statement> statements;
@@ -145,7 +145,7 @@ public class SonarEngine extends CpdEngine {
     try {
       for (File file : sourceFiles) {
         LOG.debug("Detection of duplications for {}", file);
-        Resource<?> resource = getResource(file);
+        Resource resource = getResource(file);
         String resourceKey = getFullKey(project, resource);
 
         Collection<Block> fileBlocks = index.getByResource(resource, resourceKey);
@@ -183,12 +183,12 @@ public class SonarEngine extends CpdEngine {
     }
   }
 
-  protected Resource<?> getResource(File file) {
+  protected Resource getResource(File file) {
     String relativePath = pathResolver.relativePath(fileSystem.sourceDirs(), file).path();
     return JavaFile.fromRelativePath(relativePath, false);
   }
 
-  static void save(SensorContext context, Resource<?> resource, @Nullable Iterable<CloneGroup> duplications) {
+  static void save(SensorContext context, Resource resource, @Nullable Iterable<CloneGroup> duplications) {
     if (duplications == null || Iterables.isEmpty(duplications)) {
       return;
     }
diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java
index 979c08cc801..3b4b2a30572 100644
--- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java
+++ b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/SonarEngineTest.java
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
 public class SonarEngineTest {
 
   private SensorContext context;
-  private Resource<?> resource;
+  private Resource resource;
 
   @Before
   public void setUp() {
@@ -67,7 +67,7 @@ public class SonarEngineTest {
     when(pathResolver.relativePath(anyCollection(), any(java.io.File.class))).thenReturn(relativePath);
 
     SonarEngine engine = new SonarEngine(null, fileSystem, pathResolver, null);
-    Resource<?> resource = engine.getResource(new java.io.File(""));
+    Resource resource = engine.getResource(new java.io.File(""));
 
     assertThat(resource.getKey()).isEqualTo("com.foo.Bar");
     assertThat(resource).isInstanceOf(JavaFile.class);