diff options
author | 2018-09-26 07:58:19 +0000 | |
---|---|---|
committer | 2018-09-26 07:58:19 +0000 | |
commit | e42dd7fc12a590228effffc4b97ff8ef288aef48 (patch) | |
tree | 6333d8af08988314000f8d16d4f7212accf6184c /vid-app-common/src/main | |
parent | 7b8621da349c49a111bd6822888ce3df76c1c027 (diff) | |
parent | f24045484892ec59f5aff1c42252ae0ec10e2f66 (diff) |
Merge "Add junits to commit info endpoint"
Diffstat (limited to 'vid-app-common/src/main')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/controllers/HealthCheckController.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/HealthCheckController.java b/vid-app-common/src/main/java/org/onap/vid/controllers/HealthCheckController.java index 03dc8083e..12cc68e61 100644 --- a/vid-app-common/src/main/java/org/onap/vid/controllers/HealthCheckController.java +++ b/vid-app-common/src/main/java/org/onap/vid/controllers/HealthCheckController.java @@ -25,6 +25,7 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.util.SystemProperties; import org.onap.vid.dao.FnAppDoaImpl; import org.onap.vid.model.GitRepositoryState; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,7 +47,6 @@ import java.util.Properties; @RequestMapping("/") public class HealthCheckController extends UnRestrictedBaseController { - /** * The logger. */ @@ -58,6 +58,7 @@ public class HealthCheckController extends UnRestrictedBaseController { final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS"); private static final String HEALTH_CHECK_PATH = "/healthCheck"; + private static final String GIT_PROPERTIES_FILENAME = "git.properties"; /** * Model for JSON response with health-check results. @@ -193,10 +194,10 @@ public class HealthCheckController extends UnRestrictedBaseController { return healthStatus; } - @RequestMapping(value = "/version", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/commitInfo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) public GitRepositoryState getCommitInfo() throws IOException { Properties properties = new Properties(); - properties.load(getClass().getClassLoader().getResourceAsStream("git.properties")); + properties.load(getClass().getClassLoader().getResourceAsStream(GIT_PROPERTIES_FILENAME)); return new GitRepositoryState(properties); } } |