diff --git a/service/config/sample.yml b/service/config/sample.yml index 805c46f98..dfe3be84e 100644 --- a/service/config/sample.yml +++ b/service/config/sample.yml @@ -261,5 +261,5 @@ donation: badges: badges: - - name: TEST + - id: TEST imageUrl: https://example.com/test-badge diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java b/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java index cdb9f87c3..71155374a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java +++ b/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; } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java index 1c4080c31..84570350e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java +++ b/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 diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverterTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverterTest.java index 83537ac6f..259dbcfe0 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverterTest.java +++ b/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); }