diff options
author | Piotr Wielebski <piotr.wielebski@nokia.com> | 2019-05-30 12:52:55 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-05-30 12:52:55 +0000 |
commit | 85b1c64b4a2e6c0c01046fdd8b643cffff76ae32 (patch) | |
tree | 76b8d11f3c90e5306b24ef565ecab6192b5aac8d /prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/AppInfoController.java | |
parent | dc98386e6e888cc0e0c54bc9e984c9d0ada5e73a (diff) | |
parent | 6ae123a7e8c095dd87c9b459b86195f9f492b508 (diff) |
Merge "Configs cleanup Adding test for AppInfoController"
Diffstat (limited to 'prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/AppInfoController.java')
-rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/AppInfoController.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/AppInfoController.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/AppInfoController.java index 9a49dee5..7475814f 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/AppInfoController.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/controllers/AppInfoController.java @@ -20,13 +20,17 @@ package org.onap.dcaegen2.services.prh.controllers; -import io.swagger.annotations.*; -import org.onap.dcaegen2.services.prh.configuration.Config; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.onap.dcaegen2.services.prh.configuration.PrhAppConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; -import org.springframework.http.*; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; @@ -39,11 +43,10 @@ import reactor.core.publisher.Mono; public class AppInfoController { private static final Logger LOGGER = LoggerFactory.getLogger(AppInfoController.class); - private final Resource gitInfo; + private final PrhAppConfig config; - @Autowired - public AppInfoController(Config config) { - gitInfo = config.getGitInfo(); + public AppInfoController(PrhAppConfig config) { + this.config = config; } @GetMapping(value = "heartbeat", produces = MediaType.TEXT_PLAIN_VALUE) @@ -58,6 +61,6 @@ public class AppInfoController { @GetMapping(value = "version", produces = MediaType.APPLICATION_JSON_VALUE) @ApiOperation("Returns version information") public Mono<Resource> version() { - return Mono.defer(() -> Mono.just(gitInfo)); + return Mono.defer(() -> Mono.just(config.getGitInfo())); } } |