#IPTE-22: added git commit details to properties and startup log

Author: Death111

src/main/java/de/doubleslash/keeptime/ApplicationProperties.java

@@ -15,6 +15,11 @@ public class ApplicationProperties {
    private String springDataSourceUserName;
    private String springDataSourcePassword;
 
+   private String gitCommitId;
+   private String gitCommitTime;
+   private String gitBranch;
+   private String gitDirty;
+
    public String getBuildVersion() {
       return buildVersion;
    }
@@ -68,4 +73,40 @@ public String getSpringDataSourcePassword() {
    private void setSpringDataSourcePassword(String springDataSourcePassword) {
       this.springDataSourcePassword = springDataSourcePassword;
    }
+
+   public String getGitCommitId() {
+      return gitCommitId;
+   }
+
+   @Value("${git.commit.id}")
+   private void setGitCommitId(String gitCommitId) {
+      this.gitCommitId = gitCommitId;
+   }
+
+   public String getGitCommitTime() {
+      return gitCommitTime;
+   }
+
+   @Value("${git.commit.time}")
+   private void setGitCommitTime(String gitCommitTime) {
+      this.gitCommitTime = gitCommitTime;
+   }
+
+   public String getGitBranch() {
+      return gitBranch;
+   }
+
+   @Value("${git.branch}")
+   private void setGitBranch(String gitBranch) {
+      this.gitBranch = gitBranch;
+   }
+
+   public String getGitDirty() {
+      return gitDirty;
+   }
+
+   @Value("${git.dirty}")
+   private void setGitDirty(String gitDirty) {
+      this.gitDirty = gitDirty;
+   }
 }

src/main/java/de/doubleslash/keeptime/Main.java

@@ -87,6 +87,10 @@ public void init() throws Exception {
       ApplicationProperties applicationProperties = springContext.getBean(ApplicationProperties.class);
       LOG.info("KeepTime Version: '{}'.", applicationProperties.getBuildVersion());
       LOG.info("KeepTime Build Timestamp: '{}'.", applicationProperties.getBuildTimestamp());
+      LOG.info("KeepTime Git Infos: id '{}', branch '{}', time '{}', dirty '{}'.",
+            applicationProperties.getGitCommitId(), applicationProperties.getGitBranch(),
+            applicationProperties.getGitCommitTime(), applicationProperties.getGitDirty());
+
       model = springContext.getBean(Model.class);
       controller = springContext.getBean(Controller.class);
       model.setSpringContext(springContext);
@@ -137,8 +141,7 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
       FontProvider.loadFonts();
       readSettings();
 
-      final List<Work> todaysWorkItems = model.getWorkRepository()
-            .findByStartDateOrderByStartTimeAsc(LocalDate.now());
+      final List<Work> todaysWorkItems = model.getWorkRepository().findByStartDateOrderByStartTimeAsc(LocalDate.now());
       LOG.info("Found {} past work items", todaysWorkItems.size());
       model.getPastWorkItems().addAll(todaysWorkItems);
 
@@ -153,7 +156,7 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
 
       model.getAllProjects().addAll(projects);
       model.getAvailableProjects()
-            .addAll(model.getAllProjects().stream().filter(Project::isEnabled).collect(Collectors.toList()));
+           .addAll(model.getAllProjects().stream().filter(Project::isEnabled).collect(Collectors.toList()));
 
       // set default project
       final Optional<Project> findAny = projects.stream().filter(Project::isDefault).findAny();

src/main/resources/application.properties

@@ -1,14 +1,20 @@
 # H2
 spring.h2.console.enabled=true
 spring.h2.console.path=/h2
-
 h2.version=@h2.version@
 
+# build infos
 build.version=@project.version@
 build.timestamp=@maven.build.timestamp@
 
+# git-commit-id-plugin
+git.commit.id=@git.commit.id.full@
+git.commit.time=@git.commit.time@
+git.branch=@git.branch@
+git.dirty=@git.dirty@
+
 # Datasource
-spring.datasource.url=jdbc:h2:file:./db/keeptime-h2-db;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:file:./db/@h2.version@/keeptime-h2-db;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.username=sa
 spring.datasource.password=
 spring.datasource.driver-class-name=org.h2.Driver