SONAR-1378 auto-detect password properties that are suffixed by .password.secured

1 files changed, 10 insertions, 1 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
index ef98057d6b5..2adfb8232e7 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
@@ -75,10 +75,19 @@ public final class PropertyDefinition {
     this.onProject = annotation.project();
     this.onModule = annotation.module();
     this.category = annotation.category();
-    this.type = annotation.type();
+    this.type = fixType(annotation.key(), annotation.type());
     this.options = annotation.options();
   }
 
+  private PropertyType fixType(String key, PropertyType type) {
+    // Auto-detect passwords for old versions of plugins that
+    // do not declare the type
+    if (type==PropertyType.STRING && StringUtils.endsWith(key, ".password.secured")) {
+      return PropertyType.PASSWORD;
+    }
+    return type;
+  }
+
   @VisibleForTesting
   PropertyDefinition(PropertyType type, String[] options) {
     this.type = type;