added missing files from last commit due to git error

Author: janniclas

app/controllers/ApiRouter.scala

@@ -28,12 +28,13 @@ import play.api.routing.sird._
   * Endpoints.
   * @param controller Controller components reference
   */
-class ApiRouter @Inject()(controller: InstanceRegistryController)
+class ApiRouter @Inject()(irController: InstanceRegistryController, sysController: SystemInfoController)
   extends SimpleRouter
 {
 
   override def routes: Routes = {
-    case GET(p"/numberOfInstances" ? q"componentType=$componentType") => controller.numberOfInstances(componentType)
-    case GET(p"/instances" ? q"componentType=$componentType") => controller.instances(componentType)
+    case GET(p"/numberOfInstances" ? q"componentType=$componentType") => irController.numberOfInstances(componentType)
+    case GET(p"/instances" ? q"componentType=$componentType") => irController.instances(componentType)
+    case GET(p"/systemInfo") => sysController.getInfo()
   }
 }

app/controllers/FrontendController.scala

@@ -32,7 +32,7 @@ import play.api.mvc._
   */
 @Singleton
 class FrontendController @Inject()(assets: Assets, errorHandler: HttpErrorHandler, config: Configuration, cc: ControllerComponents)
-  extends AbstractController(cc) with I18nSupport{
+  extends AbstractController(cc) with I18nSupport {
 
   def index: Action[AnyContent] = assets.at("index.html")
 

app/controllers/SystemInfoController.scala

@@ -19,42 +19,41 @@
  package controllers
 
  import java.net.InetAddress
+
+ import javax.inject.Inject
+ import play.api.mvc.{Action, AnyContent, BaseController, ControllerComponents}
  import play.core.PlayVersion
+ import play.api.libs.json.Json
+
+ class SystemInfoController @Inject()(val controllerComponents: ControllerComponents) extends BaseController {
 
-   object JavaVersion {
-   def apply(javaVersionPrefix: Option[String]): String = {
-     val version = sys.props.get("java.version") getOrElse {sys.error("failed to get system property java.version")}
+  def getInfo: Action[AnyContent] = Action {
+    Ok(Json.obj("hostName" -> getHostName(), "javaVersion" -> getJvmVersion(), "platformName" -> getPlatformName(), "scalaVersion" -> getScalaVersion()))
+  }
 
-     javaVersionPrefix match {
-       case Some(prefix) =>
-         if (!version.startsWith(prefix)) {
-           sys.error(s"javac version ${version} may not be used to publish, it has to start with ${prefix} due to javaVersionPrefix setting")
-         }
-       case None =>
+   private def getJvmVersion(): String = {
+     sys.props.get("java.version") getOrElse {
+       sys.error("failed to get system property java.version")
      }
-     version
    }
- }
 
- object HostName {
-   def apply(host: Option[String]): String = {
-    val hostname = InetAddress.getLocalHost().getHostName()
-    hostname
-   }
- }
-
- object PlatformName {
-   def apply(platform: Option[String]): String = {
-     val os = "os.name";
-     val version = "os.version";
-     val osVersion = System.getProperty(os) + " " + System.getProperty(version)
-     osVersion
-   }
- }
 
- object ScalaVersion {
-   def apply(browser: Option[String]): String = {
-     val scalaVersion = PlayVersion.current
-     scalaVersion
-   }
+
+     private def getHostName(): String = {
+       InetAddress.getLocalHost().getHostName()
+     }
+
+
+    private def getPlatformName(): String = {
+       val os = "os.name";
+       val version = "os.version";
+       val osVersion: String = System.getProperty(os) + " " + System.getProperty(version)
+       osVersion
+     }
+
+
+   private def getScalaVersion(): String = {
+       PlayVersion.current
+     }
+
  }