Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 07:58:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename id to name in the configuration

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/badges/ConfiguredProfileBadgeConverter.java
View File

@@ -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;
}

10
service/src/main/java/org/whispersystems/textsecuregcm/configuration/BadgeConfiguration.java
View File

@@ -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