SONAR-3024 Perform one shot migration of all project resources

5 files changed, 13 insertions, 26 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/ResourceModel.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/ResourceModel.java
index e3e97d5f8ac..1650c324fc6 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/ResourceModel.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/ResourceModel.java
@@ -380,8 +380,7 @@ public class ResourceModel extends BaseIdentifiable implements Cloneable {
     ResourceModel model = new ResourceModel();
     model.setEnabled(Boolean.TRUE);
     model.setDescription(resource.getDescription());
-    model.setKey(resource.getKey());
-    model.setDeprecatedKey(resource.getDeprecatedKey());
+    model.setKey(resource.getEffectiveKey());
     model.setPath(resource.getPath());
     if (resource.getLanguage() != null) {
       model.setLanguageKey(resource.getLanguage().getKey());
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 cedd0097937..770a58e9340 100644
--- 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
@@ -87,8 +87,8 @@ public class JavaFile extends Resource {
    * @deprecated since 4.2 use {@link #create(String, String, boolean)}
    */
   @Deprecated
-  public JavaFile(String key) {
-    this(key, false);
+  public JavaFile(String deprecatedKey) {
+    this(deprecatedKey, false);
   }
 
   /**
@@ -98,11 +98,11 @@ public class JavaFile extends Resource {
    * @deprecated since 4.2 use {@link #create(String, String, boolean)}
    */
   @Deprecated
-  public JavaFile(String key, boolean unitTest) {
-    if (key == null) {
+  public JavaFile(String deprecatedKey, boolean unitTest) {
+    if (deprecatedKey == null) {
       throw new IllegalArgumentException("Java filename can not be null");
     }
-    String realKey = StringUtils.trim(key);
+    String realKey = StringUtils.trim(deprecatedKey);
     this.unitTest = unitTest;
 
     if (realKey.contains(".")) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
index 7c89db07838..610fe166957 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
@@ -86,7 +86,6 @@ public class Project extends Resource implements Component {
     setKey(key);
     setDeprecatedKey(key);
     setEffectiveKey(key);
-    setDeprecatedEffectiveKey(key);
   }
 
   public Project(String key, String branch, String name) {
@@ -99,7 +98,6 @@ public class Project extends Resource implements Component {
     }
     setDeprecatedKey(getKey());
     setEffectiveKey(getKey());
-    setDeprecatedEffectiveKey(getKey());
     this.branch = branch;
   }
 
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
index 02383db5869..d3b521094ba 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java
@@ -132,8 +132,6 @@ public abstract class Resource implements Serializable {
 
   private String effectiveKey = null;
 
-  private String deprecatedEffectiveKey = null;
-
   private boolean isExcluded = false;
 
   /**
@@ -265,21 +263,6 @@ public abstract class Resource implements Serializable {
   }
 
   /**
-   * Internal use only
-   */
-  public String getDeprecatedEffectiveKey() {
-    return deprecatedEffectiveKey;
-  }
-
-  /**
-   * Internal use only
-   */
-  public final Resource setDeprecatedEffectiveKey(String deprecatedEffectiveKey) {
-    this.deprecatedEffectiveKey = deprecatedEffectiveKey;
-    return this;
-  }
-
-  /**
    * @deprecated since 2.6 should use SensorContext#isExcluded(resource). It will make inheritance of Resource easier.
    */
   @Deprecated
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileQuery.java
index c8dd3e3b377..95dbfb0cf12 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/scan/filesystem/FileQuery.java
@@ -52,6 +52,13 @@ public class FileQuery {
     return query;
   }
 
+  /**
+   * @since 4.2
+   */
+  public static FileQuery all() {
+    return on();
+  }
+
   public static FileQuery onSource() {
     return on(FileType.SOURCE);
   }