From a7b07ad7e0828827bf0dc41c716f904beb9f3392 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Wed, 15 Sep 2021 21:58:27 +0000
Subject: [PATCH] [Trunk | Admin Tools Library]: 1. pom.xml:         a. Added
 timestamp in properties.         b. In <build> added <resources> with
 filtering set to true. 2. GlobalVars.java: Added GlobalVars class for date of
 deploy & date of build. 3. UoaAdminToolsLibraryApplication.java: In
 @EnableConfigurationProperties added GlobalVars.class. 4.
 AdminToolsLibraryCheckDeployController.java: Added exposing date of deploy
 and date of build. 5. admintoolslibrary.properties: Added property
 admintoolslibrary.globalVars.buildDate=@timestamp@.

---
 pom.xml                                       |  8 +++++++
 .../UoaAdminToolsLibraryApplication.java      |  3 ++-
 .../configuration/GlobalVars.java             | 22 +++++++++++++++++++
 ...dminToolsLibraryCheckDeployController.java | 13 ++++++++---
 .../resources/admintoolslibrary.properties    |  1 +
 5 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/GlobalVars.java
 create mode 100644 src/main/resources/admintoolslibrary.properties

diff --git a/pom.xml b/pom.xml
index e715e6c..d5d521a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <timestampAdminToolsLibrary>${maven.build.timestamp}</timestampAdminToolsLibrary>
+        <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
     </properties>
 
     <dependencies>
@@ -103,6 +105,12 @@
             <!--</plugin>-->
         </plugins>
         <finalName>uoa-admin-tools-library</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/UoaAdminToolsLibraryApplication.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/UoaAdminToolsLibraryApplication.java
index b775c0e..86658c9 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/UoaAdminToolsLibraryApplication.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/UoaAdminToolsLibraryApplication.java
@@ -1,5 +1,6 @@
 package eu.dnetlib.uoaadmintoolslibrary;
 
+import eu.dnetlib.uoaadmintoolslibrary.configuration.GlobalVars;
 import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -8,6 +9,6 @@ import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.MailConfig;
 import org.springframework.context.annotation.Import;
 
 @SpringBootApplication//(scanBasePackages = {"eu.dnetlib.uoaauthorizationlibrary"})
-@EnableConfigurationProperties({MailConfig.class, GoogleConfig.class})
+@EnableConfigurationProperties({MailConfig.class, GoogleConfig.class, GlobalVars.class})
 @Import(AuthorizationConfiguration.class)
 public class UoaAdminToolsLibraryApplication {}
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/GlobalVars.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/GlobalVars.java
new file mode 100644
index 0000000..3228f4f
--- /dev/null
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/GlobalVars.java
@@ -0,0 +1,22 @@
+package eu.dnetlib.uoaadmintoolslibrary.configuration;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.Date;
+
+@ConfigurationProperties("admintoolslibrary.globalVars")
+public class GlobalVars {
+    public static Date date = new Date();
+    private Date buildDate;
+
+    public String getBuildDate() {
+        if(buildDate == null) {
+            return null;
+        }
+        return buildDate.toString();
+    }
+
+    public void setBuildDate(Date buildDate) {
+        this.buildDate = buildDate;
+    }
+}
diff --git a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
index c53c31e..d58ad9e 100644
--- a/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
@@ -1,8 +1,6 @@
 package eu.dnetlib.uoaadmintoolslibrary.controllers;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.CommandResult;
-import com.mongodb.DBObject;
+import eu.dnetlib.uoaadmintoolslibrary.configuration.GlobalVars;
 import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.GoogleConfig;
 import eu.dnetlib.uoaadmintoolslibrary.configuration.properties.MailConfig;
 import org.apache.log4j.Logger;
@@ -26,6 +24,9 @@ public class AdminToolsLibraryCheckDeployController {
     @Autowired
     private GoogleConfig googleConfig;
 
+    @Autowired
+    private GlobalVars globalVars;
+
     private final Logger log = Logger.getLogger(this.getClass());
 
     @RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)
@@ -46,6 +47,12 @@ public class AdminToolsLibraryCheckDeployController {
         response.put("admintoolslibrary.mail.password", mailConfig.getPassword() == null ? null : "[unexposed value]");
         response.put("admintoolslibrary.google.secret", googleConfig.getSecret() == null ? null : "[unexposed value]");
 
+        if(globalVars.date != null) {
+            response.put("Date of deploy", globalVars.date.toString());
+        }
+        if(globalVars.getBuildDate() != null) {
+            response.put("Date of build", globalVars.getBuildDate());
+        }
 //        response.put("Define also", "admintoolslibrary.mail.username, " +
 //                "admintoolslibrary.mail.password, admintoolslibrary.google.secret");
         return response;
diff --git a/src/main/resources/admintoolslibrary.properties b/src/main/resources/admintoolslibrary.properties
new file mode 100644
index 0000000..a89fdef
--- /dev/null
+++ b/src/main/resources/admintoolslibrary.properties
@@ -0,0 +1 @@
+admintoolslibrary.globalVars.buildDate=@timestampAdminToolsLibrary@
\ No newline at end of file