Rename PropertyDefinition#subcategory() to subCategory()

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 7b8885b7d697a56c89d20485be32f1d2f6db0aa8..9c89245f956e408f1d7ed1c82af614f2e25e1b5b 100644 (file)
--- 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
@@ -73,7 +73,7 @@ public final class PropertyDefinition implements BatchExtension, ServerExtension
   private String propertySetKey;
   private String deprecatedKey;
   private List<PropertyFieldDefinition> fields;
-  private String subcategory;
+  private String subCategory;
   private int index;
 
   private PropertyDefinition(Builder builder) {
@@ -82,7 +82,7 @@ public final class PropertyDefinition implements BatchExtension, ServerExtension
     this.description = builder.description;
     this.defaultValue = builder.defaultValue;
     this.category = builder.category;
-    this.subcategory = builder.subcategory;
+    this.subCategory = builder.subCategory;
     this.global = builder.global;
     this.type = builder.type;
     this.options = builder.options;
@@ -201,8 +201,8 @@ public final class PropertyDefinition implements BatchExtension, ServerExtension
     return category;
   }
 
-  public String subcategory() {
-    return subcategory;
+  public String subCategory() {
+    return subCategory;
   }
 
   /**
@@ -272,7 +272,7 @@ public final class PropertyDefinition implements BatchExtension, ServerExtension
     private String description = "";
     private String defaultValue = "";
     private String category = "";
-    private String subcategory = "default";
+    private String subCategory = "default";
     private List<String> onQualifiers = newArrayList();
     private List<String> onlyOnQualifiers = newArrayList();
     private boolean global = true;
@@ -309,8 +309,8 @@ public final class PropertyDefinition implements BatchExtension, ServerExtension
       return this;
     }
 
-    public Builder subcategory(String subcategory) {
-      this.subcategory = subcategory;
+    public Builder subCategory(String s) {
+      this.subCategory = s;
       return this;
     }
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
index 42356e0118813e3db71774ffe50b4fbb9508a7ba..d17ca152eafa5621cdb9f10dae128534ed368311 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinitions.java
@@ -99,7 +99,7 @@ public final class PropertyDefinitions implements BatchComponent, ServerComponen
     if (!definitions.containsKey(definition.key())) {
       definitions.put(definition.key(), definition);
       categories.put(definition.key(), StringUtils.defaultIfBlank(definition.category(), defaultCategory));
-      subcategories.put(definition.key(), StringUtils.defaultIfBlank(definition.subcategory(), "default"));
+      subcategories.put(definition.key(), StringUtils.defaultIfBlank(definition.subCategory(), "default"));
       if (!Strings.isNullOrEmpty(definition.deprecatedKey()) && !definition.deprecatedKey().equals(definition.key())) {
         deprecatedKeys.put(definition.deprecatedKey(), definition.key());
       }

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/config/PropertyDefinitionsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/config/PropertyDefinitionsTest.java
index be3e64dca7b4896b06cb54cc271ff684c31be423..7208f3e8cb9441a4d62bd28d10cf43f7c2f65c86 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/config/PropertyDefinitionsTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/config/PropertyDefinitionsTest.java
@@ -111,8 +111,8 @@ public class PropertyDefinitionsTest {
   @Test
   public void should_group_by_subcategory() {
     PropertyDefinitions def = new PropertyDefinitions(
-      PropertyDefinition.builder("global1").name("Global1").category("catGlobal1").subcategory("sub1").build(),
-      PropertyDefinition.builder("global2").name("Global2").category("catGlobal1").subcategory("sub2").build(),
+      PropertyDefinition.builder("global1").name("Global1").category("catGlobal1").subCategory("sub1").build(),
+      PropertyDefinition.builder("global2").name("Global2").category("catGlobal1").subCategory("sub2").build(),
       PropertyDefinition.builder("global3").name("Global3").category("catGlobal1").build(),
       PropertyDefinition.builder("global4").name("Global4").category("catGlobal2").build()
         );