Rename id to name in the configuration

service/config/sample.yml

@@ -261,5 +261,5 @@ donation:
 
 badges:
   badges:
-    - name: TEST
+    - id: TEST
       imageUrl: https://example.com/test-badge

service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java

@@ -44,7 +44,7 @@ public class ConfiguredProfileBadgeConverter implements ProfileBadgeConverter {
       final ResourceBundleFactory resourceBundleFactory) {
     this.clock = clock;
     this.knownBadges = badgesConfiguration.getBadges().stream()
-        .collect(Collectors.toMap(BadgeConfiguration::getName, Function.identity()));
+        .collect(Collectors.toMap(BadgeConfiguration::getId, Function.identity()));
     this.resourceBundleFactory = resourceBundleFactory;
   }
 

service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java

@@ -14,20 +14,20 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 public class BadgeConfiguration {
-  private final String name;
+  private final String id;
   private final URL imageUrl;
 
   @JsonCreator
   public BadgeConfiguration(
-      @JsonProperty("name") final String name,
+      @JsonProperty("id") final String id,
       @JsonProperty("imageUrl") @JsonDeserialize(converter = URLDeserializationConverter.class) final URL imageUrl) {
-    this.name = name;
+    this.id = id;
     this.imageUrl = imageUrl;
   }
 
   @NotEmpty
-  public String getName() {
-    return name;
+  public String getId() {
+    return id;
   }
 
   @NotNull

service/src/test/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverterTest.java

@@ -94,7 +94,7 @@ public class ConfiguredProfileBadgeConverterTest {
 
   private BadgeConfiguration getBadge(BadgesConfiguration badgesConfiguration, int i) {
     return badgesConfiguration.getBadges().stream()
-        .filter(badgeConfiguration -> idFor(i).equals(badgeConfiguration.getName()))
+        .filter(badgeConfiguration -> idFor(i).equals(badgeConfiguration.getId()))
         .findFirst().orElse(null);
   }