mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-02-11 14:52:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

make GitProperties autowire optional

Browse Source
This commit is contained in:
Jake Potrebic 2022-11-06 15:47:01 -08:00
parent 62968faf50
commit eb42f5db4f
No known key found for this signature in database
GPG Key ID: ECE0B3C133C016C5
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend/src/main/java/io/papermc/hangar/controller/internal/BackendDataController.java
View File

@ -52,10 +52,10 @@ public class BackendDataController {
private final ObjectMapper noJsonValueMapper;
private final HangarConfig config;
private final PlatformService platformService;
private final GitProperties gitProperties;
private final Optional<GitProperties> gitProperties;
@Autowired
public BackendDataController(ObjectMapper mapper, HangarConfig config, PlatformService platformService, GitProperties gitProperties) {
public BackendDataController(ObjectMapper mapper, HangarConfig config, PlatformService platformService, Optional<GitProperties> gitProperties) {
this.config = config;
this.noJsonValueMapper = mapper.copy();
this.platformService = platformService;
@ -191,17 +191,21 @@ public class BackendDataController {
@GetMapping("/version-info")
public Map<String, String> info() {
return Map.of(
"version", gitProperties.get("build.version"),
"committer", gitProperties.get("commit.user.name"),
"time", gitProperties.get("commit.time"),
"commit", gitProperties.getCommitId(),
"commitShort", gitProperties.getShortCommitId(),
"message", gitProperties.get("commit.message.short"),
"tag", Optional.of(gitProperties.get("tags")).orElse(gitProperties.get("closest.tag.name")),
"behind", gitProperties.get("closest.tag.commit.count")
"version", this.get("build.version", -1),
"committer", this.get("commit.user.name", "dummy"),
"time", this.get("commit.time", -1),
"commit", this.gitProperties.map(GitProperties::getCommitId).orElse("0"),
"commitShort", this.gitProperties.map(GitProperties::getShortCommitId).orElse("0"),
"message", this.get("commit.message.short", "dummy"),
"tag", this.gitProperties.map(gp -> gp.get("tags")).or(() -> this.gitProperties.map(gp -> gp.get("closest.tag.name"))).orElse("dummy"),
"behind", this.get("closest.tag.commit.count", 0)
);
}
private String get(final String propName, final Object fallback) {
return this.gitProperties.map(gp -> gp.get(propName)).orElse(fallback.toString());
}
@GetMapping("/validations")
@Cacheable("validations")
public ResponseEntity<ObjectNode> getValidations() {