update

Author: Psilo

Diff for: Information.template

@@ -1,6 +1,7 @@
 package @package@;
 
 public class Information {
-	public static final String BuildTime = "@buildTime@";
-	public static final String PomVersion = "@pomVersion@";
+	public static final String name = "@name@";
+	public static final String buildTime = "@buildTime@";
+	public static final String pomVersion = "@pomVersion@";
 }

Diff for: pom.xml

@@ -10,6 +10,7 @@
 
 	<properties>
 		<mainclass>info.unterrainer.commons.httpserver.HttpServer</mainclass>
+		<name>Http-Server</name>
 		<package-path>info/unterrainer/commons/httpserver</package-path>
 		<packg-string>info.unterrainer.commons.httpserver</packg-string>
 	</properties>
@@ -24,7 +25,7 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>jre-utils</artifactId>
-			<version>0.0.6</version>
+			<version>0.0.10</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>

Diff for: src/main/java/info/unterrainer/commons/httpserver/HttpServer.java

@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -38,6 +39,7 @@
 @Slf4j
 public class HttpServer {
 
+	private static final String VERSION_FQN = "info.unterrainer.commons.httpserver.Information";
 	private Javalin javalin;
 	private HttpServerConfiguration config;
 	private String applicationName;
@@ -46,16 +48,20 @@ public class HttpServer {
 	private final List<HandlerGroup> handlerGroups = new ArrayList<>();
 	private List<HandlerInstance> handlerInstances = new ArrayList<>();
 	ExecutorService executorService;
+	List<String> appVersionFqns;
 
 	private HttpServer() {
 	}
 
 	@Builder
 	private HttpServer(final String configPrefix, final String applicationName, final MapperFactory orikaFactory,
-			final JsonMapper jsonMapper, final ExecutorService executorService) {
+			final JsonMapper jsonMapper, final ExecutorService executorService, final String... appVersionFqns) {
 		config = HttpServerConfiguration.read(configPrefix);
 		this.applicationName = applicationName;
 		this.executorService = executorService;
+		this.appVersionFqns = new ArrayList<>(List.of(Optional.ofNullable(appVersionFqns).orElse(new String[0])));
+		if (!this.appVersionFqns.contains(VERSION_FQN))
+			this.appVersionFqns.add(VERSION_FQN);
 		if (executorService == null)
 			this.executorService = new ThreadPoolExecutor(1, 200, 0L, TimeUnit.MILLISECONDS,
 					new LinkedBlockingQueue<Runnable>());
@@ -109,7 +115,7 @@ private void create() {
 		});
 
 		get("/", new AppNameHandler(applicationName));
-		get("/version", new AppVersionHandler());
+		get("/version", new AppVersionHandler(appVersionFqns));
 		get("/datetime", new DateTimeHandler());
 		get("/health", new HealthHandler());
 

Diff for: src/main/java/info/unterrainer/commons/httpserver/Information.java

@@ -1,6 +1,7 @@
 package info.unterrainer.commons.httpserver;
 
 public class Information {
-	public static final String BuildTime = "2020-07-06T13:16:01Z";
-	public static final String PomVersion = "0.0.19";
+	public static final String name = "Http-Server";
+	public static final String buildTime = "2020-07-06T14:13:35Z";
+	public static final String pomVersion = "0.0.19";
 }

Diff for: src/main/java/info/unterrainer/commons/httpserver/handlers/AppVersionHandler.java

@@ -1,25 +1,55 @@
 package info.unterrainer.commons.httpserver.handlers;
 
-import info.unterrainer.commons.httpserver.Information;
+import java.util.ArrayList;
+import java.util.List;
+
 import info.unterrainer.commons.httpserver.enums.Attribute;
 import info.unterrainer.commons.httpserver.jsons.AppVersionJson;
+import info.unterrainer.commons.httpserver.jsons.VersionsJson;
+import info.unterrainer.commons.jreutils.ForName;
 import io.javalin.http.Context;
 import io.javalin.http.Handler;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public class AppVersionHandler implements Handler {
 
-	private AppVersionJson message;
+	private final static String NAME = "name";
+	private final static String BUILD_TIME = "buildTime";
+	private final static String POM_VERSION = "pomVersion";
+	private final List<String> appVersionFqns;
+	private VersionsJson message;
 
 	@Override
 	public void handle(final Context ctx) throws Exception {
 		if (message == null)
-			message = AppVersionJson.builder()
-					.PomVersion(Information.PomVersion)
-					.BuildTime(Information.BuildTime)
-					.build();
+			message = buildMessage();
 		ctx.attribute(Attribute.RESPONSE_OBJECT, message);
 		ctx.attribute(Attribute.RESPONSE_STATUS, 200);
 	}
+
+	private VersionsJson buildMessage() {
+		List<AppVersionJson> versions = new ArrayList<>();
+		for (String fqn : appVersionFqns) {
+			Class<?> clazz = ForName.get(fqn);
+			if (clazz == null)
+				continue;
+
+			String name;
+			String buildTime;
+			String pomVersion;
+			try {
+				name = (String) clazz.getField(NAME).get(null);
+				buildTime = (String) clazz.getField(BUILD_TIME).get(null);
+				pomVersion = (String) clazz.getField(POM_VERSION).get(null);
+
+			} catch (IllegalAccessException | IllegalArgumentException | SecurityException | NoSuchFieldException e) {
+				continue;
+			}
+
+			AppVersionJson av = AppVersionJson.builder().name(name).pomVersion(pomVersion).buildTime(buildTime).build();
+			versions.add(av);
+		}
+		return VersionsJson.builder().Versions(versions).build();
+	}
 }

Diff for: src/main/java/info/unterrainer/commons/httpserver/jsons/AppVersionJson.java

@@ -9,6 +9,7 @@
 @SuperBuilder(toBuilder = true)
 public class AppVersionJson {
 
-	private String BuildTime;
-	private String PomVersion;
+	private String name;
+	private String buildTime;
+	private String pomVersion;
 }

Diff for: src/main/java/info/unterrainer/commons/httpserver/jsons/VersionsJson.java

@@ -0,0 +1,15 @@
+package info.unterrainer.commons.httpserver.jsons;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@NoArgsConstructor
+@SuperBuilder(toBuilder = true)
+public class VersionsJson {
+
+	private List<AppVersionJson> Versions;
+}