From 82ab7512e9559f8e81746727017ad7022cce9c57 Mon Sep 17 00:00:00 2001
From: slabiak <slabiak.tomasz@gmail.com>
Date: Tue, 22 Dec 2020 19:38:58 +0100
Subject: [PATCH] release v1.0.1 (#22)

* set correct version

* add current version to footer
---
 pom.xml                                       | 23 +++++++++++++--
 .../config/VersionInterceptor.java            | 28 +++++++++++++++++++
 .../config/WebMvcConfig.java                  | 18 ++++++++++++
 .../resources/templates/fragments/layout.html |  3 ++
 src/main/resources/templates/home.html        |  3 +-
 5 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/example/slabiak/appointmentscheduler/config/VersionInterceptor.java
 create mode 100644 src/main/java/com/example/slabiak/appointmentscheduler/config/WebMvcConfig.java

diff --git a/pom.xml b/pom.xml
index b36e4f4..03c972c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.example.slabiak</groupId>
 	<artifactId>appointmentscheduler</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<name>appointmentscheduler</name>
 	<description>Demo project for Spring Boot</description>
 
@@ -35,6 +35,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>mysql</groupId>
@@ -163,6 +167,21 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>build-info</goal>
+						</goals>
+						<configuration>
+							<additionalProperties>
+								<encoding.source>UTF-8</encoding.source>
+								<encoding.reporting>UTF-8</encoding.reporting>
+								<java.source>${maven.compiler.source}</java.source>
+								<java.target>${maven.compiler.target}</java.target>
+							</additionalProperties>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 
 			<plugin>
diff --git a/src/main/java/com/example/slabiak/appointmentscheduler/config/VersionInterceptor.java b/src/main/java/com/example/slabiak/appointmentscheduler/config/VersionInterceptor.java
new file mode 100644
index 0000000..0dc7671
--- /dev/null
+++ b/src/main/java/com/example/slabiak/appointmentscheduler/config/VersionInterceptor.java
@@ -0,0 +1,28 @@
+package com.example.slabiak.appointmentscheduler.config;
+
+import org.springframework.boot.info.BuildProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Component
+public class VersionInterceptor extends HandlerInterceptorAdapter {
+
+    private BuildProperties buildProperties;
+
+    public VersionInterceptor(BuildProperties buildProperties) {
+        this.buildProperties = buildProperties;
+    }
+
+    @Override
+    public void postHandle(final HttpServletRequest request, final HttpServletResponse response, final Object handler,
+                           final ModelAndView modelAndView) throws Exception {
+
+        if (modelAndView != null) {
+            modelAndView.getModelMap().addAttribute("currentVersion", buildProperties.getVersion());
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/slabiak/appointmentscheduler/config/WebMvcConfig.java b/src/main/java/com/example/slabiak/appointmentscheduler/config/WebMvcConfig.java
new file mode 100644
index 0000000..93cbcf7
--- /dev/null
+++ b/src/main/java/com/example/slabiak/appointmentscheduler/config/WebMvcConfig.java
@@ -0,0 +1,18 @@
+package com.example.slabiak.appointmentscheduler.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private VersionInterceptor versionInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(versionInterceptor);
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html
index c10f5db..8bb5805 100644
--- a/src/main/resources/templates/fragments/layout.html
+++ b/src/main/resources/templates/fragments/layout.html
@@ -104,6 +104,9 @@
 <!-- Page Content -->
 <div class="container">
     <th:block th:include="${content}"/>
+    <div class="row align-items-center justify-content-center" style="margin-top: 50px">
+        <p>AppointmentScheduler, v<span th:text="${currentVersion}">1.0</span></p>
+    </div>
 </div>
 
 <script th:inline="javascript">
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index 90c4ef2..b320acc 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'home','Home')}"
-      xmlns:sec="http://www.w3.org/1999/xhtml">
+>
 
 <body>
 <div class="row mt-3">
@@ -14,7 +14,6 @@
 
     </div>
 </div>
-</div>
 
 <script th:inline="javascript">
     $(function () {