SONAR-2501 refactor BeanGraph layer

4 files changed, 14 insertions, 17 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java b/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java
index c7edc4c3b48..873d55748b9 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java
@@ -20,7 +20,7 @@
 package org.sonar.api.component;
 
 public interface Component<CHILD extends Component> {
-  String getKey();
-  String getName();
-  String getQualifier();
+  String key();
+  String name();
+  String qualifier();
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/component/Perspectives.java b/sonar-plugin-api/src/main/java/org/sonar/api/component/Perspectives.java
index ae6aa8c927d..59cd5a4d9ca 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/component/Perspectives.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/component/Perspectives.java
@@ -19,11 +19,11 @@
  */
 package org.sonar.api.component;
 
-import org.sonar.api.BatchExtension;
-import org.sonar.api.ServerExtension;
+import org.sonar.api.BatchComponent;
+import org.sonar.api.ServerComponent;
 
-public interface Perspectives extends BatchExtension, ServerExtension {
+public interface Perspectives extends BatchComponent, ServerComponent {
 
-  <P extends Perspective> P as(Component component, Class<P> toClass);
+  <P extends Perspective> P as(Class<P> perspectiveClass, Component component);
 
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/component/ResourcePerspectives.java b/sonar-plugin-api/src/main/java/org/sonar/api/component/ResourcePerspectives.java
index de28090d227..eebba6edddd 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/component/ResourcePerspectives.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/component/ResourcePerspectives.java
@@ -23,13 +23,10 @@ import org.sonar.api.resources.Resource;
 
 /**
  * Only on batch-side.
+ *
  * @since 3.5
  */
 public interface ResourcePerspectives extends Perspectives {
 
-  /**
-   * @deprecated backward-compatibility with deprecated API org.sonar.api.resources
-   */
-  @Deprecated
-  <P extends Perspective> P as(Resource resource, Class<P> toClass);
+  <P extends Perspective> P as(Class<P> perspectiveClass, Resource resource);
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java b/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java
index 6173771765e..d67a1b154fb 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java
@@ -31,7 +31,7 @@ public class MockSourceFile implements SourceFile {
   private MockSourceFile() {
   }
 
-  public String getKey() {
+  public String key() {
     return key;
   }
 
@@ -40,7 +40,7 @@ public class MockSourceFile implements SourceFile {
     return this;
   }
 
-  public String getQualifier() {
+  public String qualifier() {
     return qualifier;
   }
 
@@ -49,7 +49,7 @@ public class MockSourceFile implements SourceFile {
     return this;
   }
 
-  public String getLanguage() {
+  public String language() {
     return language;
   }
 
@@ -58,7 +58,7 @@ public class MockSourceFile implements SourceFile {
     return this;
   }
 
-  public String getName() {
+  public String name() {
     return name;
   }
 
@@ -67,7 +67,7 @@ public class MockSourceFile implements SourceFile {
     return this;
   }
 
-  public String getLongName() {
+  public String longName() {
     return longName;
   }