SONAR-926 Update JavaFile name to contains extension

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
index 9ea35f8580a25b6fc68d366f5970d5358326ec6e..bb8471c82d551e1a7bf61d11a5a3029c9c8f2d04 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/JavaFile.java
@@ -151,7 +151,7 @@ public class JavaFile extends Resource {
    */
   @Override
   public String getName() {
-    return className;
+    return StringUtils.isNotBlank(filename) ? filename : (className + JAVA_SUFFIX);
   }
 
   /**

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java
index a826c207c0a2d98a3f26db78eab2169b9d82af86..684d08aadd8cd0d79a534329ef5590c65c2813f9 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/resources/JavaFileTest.java
@@ -45,7 +45,7 @@ public class JavaFileTest {
     JavaFile javaClass = JavaFile.create("src/main/java/org/foo/bar/Hello.java", "org/foo/bar/Hello.java", false);
     assertThat(javaClass.getKey()).isEqualTo("/src/main/java/org/foo/bar/Hello.java");
     assertThat(javaClass.getDeprecatedKey(), is("org.foo.bar.Hello"));
-    assertThat(javaClass.getName(), is("Hello"));
+    assertThat(javaClass.getName(), is("Hello.java"));
     assertThat(javaClass.getLongName(), is("org.foo.bar.Hello"));
     assertThat(javaClass.getParent().getKey(), is("/src/main/java/org/foo/bar"));
     assertThat(javaClass.getParent().getDeprecatedKey(), is("org.foo.bar"));
@@ -55,7 +55,7 @@ public class JavaFileTest {
   public void testNewClassByDeprecatedKey() {
     JavaFile javaClass = new JavaFile("org.foo.bar.Hello", false);
     assertThat(javaClass.getDeprecatedKey(), is("org.foo.bar.Hello"));
-    assertThat(javaClass.getName(), is("Hello"));
+    assertThat(javaClass.getName(), is("Hello.java"));
     assertThat(javaClass.getLongName(), is("org.foo.bar.Hello"));
     assertThat(javaClass.getParent().getDeprecatedKey(), is("org.foo.bar"));
   }
@@ -64,7 +64,7 @@ public class JavaFileTest {
   public void testNewClassWithExplicitPackage() {
     JavaFile javaClass = new JavaFile("org.foo.bar", "Hello", false);
     assertThat(javaClass.getDeprecatedKey(), is("org.foo.bar.Hello"));
-    assertThat(javaClass.getName(), is("Hello"));
+    assertThat(javaClass.getName(), is("Hello.java"));
     assertThat(javaClass.getLongName(), is("org.foo.bar.Hello"));
     assertThat(javaClass.getParent().getDeprecatedKey(), is("org.foo.bar"));
   }
@@ -81,7 +81,7 @@ public class JavaFileTest {
     JavaFile javaClass = JavaFile.create("src/main/java/Hello.java", "Hello.java", false);
     assertThat(javaClass.getKey()).isEqualTo("/src/main/java/Hello.java");
     assertThat(javaClass.getDeprecatedKey(), is(JavaPackage.DEFAULT_PACKAGE_NAME + ".Hello"));
-    assertThat(javaClass.getName(), is("Hello"));
+    assertThat(javaClass.getName(), is("Hello.java"));
     assertThat(javaClass.getLongName(), is("Hello"));
     assertThat(javaClass.getParent().getKey()).isEqualTo("/src/main/java");
     assertThat(javaClass.getParent().getDeprecatedKey()).isEqualTo(JavaPackage.DEFAULT_PACKAGE_NAME);
@@ -92,7 +92,7 @@ public class JavaFileTest {
   public void testNewClassWithEmptyPackageDeprecatedConstructor() {
     JavaFile javaClass = new JavaFile("", "Hello", false);
     assertThat(javaClass.getDeprecatedKey(), is(JavaPackage.DEFAULT_PACKAGE_NAME + ".Hello"));
-    assertThat(javaClass.getName(), is("Hello"));
+    assertThat(javaClass.getName(), is("Hello.java"));
     assertThat(javaClass.getLongName(), is("Hello"));
     assertThat(javaClass.getParent().isDefault(), is(true));
   }
@@ -101,7 +101,7 @@ public class JavaFileTest {
   public void testNewClassWithNullPackageDeprecatedConstructor() {
     JavaFile javaClass = new JavaFile(null, "Hello", false);
     assertThat(javaClass.getDeprecatedKey(), is(JavaPackage.DEFAULT_PACKAGE_NAME + ".Hello"));
-    assertThat(javaClass.getName(), is("Hello"));
+    assertThat(javaClass.getName(), is("Hello.java"));
     assertThat(javaClass.getLongName(), is("Hello"));
     assertThat((javaClass.getParent()).isDefault(), is(true));
   }
@@ -110,7 +110,7 @@ public class JavaFileTest {
   public void shouldBeDefaultPackageIfNoPackage() {
     JavaFile javaClass = new JavaFile("Hello", false);
     assertEquals(JavaPackage.DEFAULT_PACKAGE_NAME + ".Hello", javaClass.getDeprecatedKey());
-    assertThat(javaClass.getName(), is("Hello"));
+    assertThat(javaClass.getName(), is("Hello.java"));
     assertThat(javaClass.getLongName(), is("Hello"));
     assertThat(javaClass.getParent().isDefault(), is(true));
   }
@@ -120,7 +120,7 @@ public class JavaFileTest {
     JavaFile javaClass = new JavaFile("org.foo.bar.Java", false);
     assertThat(javaClass.getDeprecatedKey(), is("org.foo.bar.Java"));
     assertThat(javaClass.getLongName(), is("org.foo.bar.Java"));
-    assertThat(javaClass.getName(), is("Java"));
+    assertThat(javaClass.getName(), is("Java.java"));
     JavaPackage parent = javaClass.getParent();
     assertEquals("org.foo.bar", parent.getDeprecatedKey());
   }
@@ -130,7 +130,7 @@ public class JavaFileTest {
     JavaFile clazz = new JavaFile("   org.foo.bar.Hello   ", false);
     assertThat(clazz.getDeprecatedKey(), is("org.foo.bar.Hello"));
     assertThat(clazz.getLongName(), is("org.foo.bar.Hello"));
-    assertThat(clazz.getName(), is("Hello"));
+    assertThat(clazz.getName(), is("Hello.java"));
     JavaPackage parent = clazz.getParent();
     assertThat(parent.getDeprecatedKey(), is("org.foo.bar"));
   }
@@ -161,7 +161,7 @@ public class JavaFileTest {
     List<File> sources = Arrays.asList(sourceDir);
     JavaFile javaFile = JavaFile.fromAbsolutePath(absPath(sourceDir, "onelevel/MyFile.java"), sources, false);
     assertEquals("onelevel.MyFile", javaFile.getDeprecatedKey());
-    assertEquals("MyFile", javaFile.getName());
+    assertEquals("MyFile.java", javaFile.getName());
     assertEquals("onelevel", javaFile.getParent().getDeprecatedKey());
     assertEquals("onelevel", javaFile.getParent().getName());
     assertThat(javaFile.getParent().isDefault(), is(false));
@@ -175,7 +175,7 @@ public class JavaFileTest {
     JavaFile javaFile = JavaFile.fromAbsolutePath(absPath(sources2, "foo/bar/MyFile.java"), sources, false);
     assertThat("foo.bar.MyFile", is(javaFile.getDeprecatedKey()));
     assertThat(javaFile.getLongName(), is("foo.bar.MyFile"));
-    assertThat(javaFile.getName(), is("MyFile"));
+    assertThat(javaFile.getName(), is("MyFile.java"));
     assertThat(javaFile.getParent().getDeprecatedKey(), is("foo.bar"));
   }
 
@@ -187,7 +187,7 @@ public class JavaFileTest {
 
     JavaFile javaClass = JavaFile.fromAbsolutePath(absPath(source1, "MyClass.java"), sources, false);
     assertEquals(JavaPackage.DEFAULT_PACKAGE_NAME + ".MyClass", javaClass.getDeprecatedKey());
-    assertEquals("MyClass", javaClass.getName());
+    assertEquals("MyClass.java", javaClass.getName());
 
     assertThat((javaClass.getParent()).isDefault(), is(true));
   }