Rename id to name in the configuration

This commit is contained in:
Ehren Kret 2021-09-15 17:30:05 -05:00
parent 39f6eadbb9
commit ce3835e176
4 changed files with 8 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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