Refactor resources API

3 files changed, 14 insertions, 13 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java b/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java
index c018516ffe3..302d15ac4d0 100644
--- a/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java
+++ b/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java
@@ -52,17 +52,16 @@ public final class ComponentKeys {
   /**
    * @return the full key of a component, based on its parent projects' key and own key
    */
-  public static String createEffectiveKey(Project project, Resource resource) {
-    String key = resource.getKey();
+  public static String createEffectiveKey(String moduleKey, Resource resource) {
     if (!StringUtils.equals(Scopes.PROJECT, resource.getScope())) {
       // not a project nor a library
-      key = new StringBuilder(MAX_COMPONENT_KEY_LENGTH)
-        .append(project.getKey())
+      return new StringBuilder(MAX_COMPONENT_KEY_LENGTH)
+        .append(moduleKey)
         .append(':')
         .append(resource.getKey())
         .toString();
     }
-    return key;
+    return resource.getKey();
   }
 
   public static String createEffectiveKey(String moduleKey, InputPath inputPath) {
diff --git a/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java b/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java
index 7e206f8053a..233d818a842 100644
--- a/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java
@@ -19,28 +19,29 @@
  */
 package org.sonar.core.component;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.sonar.api.batch.bootstrap.ProjectDefinition;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.resources.Directory;
 import org.sonar.api.resources.Project;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class ComponentKeysTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
   @Test
   public void create_effective_key() {
-    Project project = new Project("my_project");
-    assertThat(ComponentKeys.createEffectiveKey(project, project)).isEqualTo("my_project");
+    Project project = new Project(ProjectDefinition.create().setKey("my_project"));
+    assertThat(ComponentKeys.createEffectiveKey("my_project", project)).isEqualTo("my_project");
 
     Directory dir = Directory.create("src/org/foo");
-    assertThat(ComponentKeys.createEffectiveKey(project, dir)).isEqualTo("my_project:src/org/foo");
+    assertThat(ComponentKeys.createEffectiveKey("my_project", dir)).isEqualTo("my_project:src/org/foo");
 
     InputFile file = mock(InputFile.class);
     when(file.relativePath()).thenReturn("foo/Bar.php");
diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
index 872094de53e..5dec478aa77 100644
--- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
@@ -29,6 +29,7 @@ import java.net.PasswordAuthentication;
 import java.net.Proxy;
 import java.net.ProxySelector;
 import java.net.SocketAddress;
+import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -141,7 +142,7 @@ public class DefaultHttpDownloaderTest {
       public boolean matches(Object ex) {
         return
             // Java 8
-            ex instanceof NoRouteToHostException
+            ex instanceof NoRouteToHostException || ex instanceof SocketException
                 // Java 7 or before
             || ex instanceof SocketTimeoutException;
       }