100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added info endpoint and manager system.properties
Rich Turnerc605db308682
diff --git a/manager/build.gradle b/manager/build.gradleindex ddf287598..2c66316dc 100644--- a/manager/build.gradle+++ b/manager/build.gradle@@ -20,6 +20,11 @@ dependencies {compile "org.simplejavamail:simple-java-mail:$simpleJavaMailVersion"}+// Load version properties file and use same version as source code+def props = new Properties()+file("src/main/resources/system.properties").withInputStream { props.load(it) }+version = props.get("version")+jar {archivesBaseName = "openremote-${project.name}"}diff --git a/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java b/manager/src/main/java/org/openremote/manager/system/HealthStatusService.javaindex 5e01e8f88..e86276ac7 100644--- a/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java+++ b/manager/src/main/java/org/openremote/manager/system/HealthStatusService.java@@ -23,13 +23,14 @@ import org.openremote.container.Container;import org.openremote.container.ContainerService;import org.openremote.container.web.WebService;import org.openremote.model.system.HealthStatusProvider;+import org.openremote.model.system.StatusResource;import java.util.ArrayList;import java.util.List;import java.util.ServiceLoader;/**- * This service is here to initialise the {@link org.openremote.model.system.HealthStatusResource}.+ * This service is here to initialise the {@link StatusResource}.*/public class HealthStatusService implements ContainerService {@@ -47,7 +48,7 @@ public class HealthStatusService implements ContainerService {}container.getService(WebService.class).getApiSingletons().add(- new HealthStatusResourceImpl(healthStatusProviderList)+ new StatusResourceImpl(healthStatusProviderList));}diff --git a/manager/src/main/java/org/openremote/manager/system/HealthStatusResourceImpl.java b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.javasimilarity index 60%rename from manager/src/main/java/org/openremote/manager/system/HealthStatusResourceImpl.javarename to manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.javaindex efd083924..a9ab099b8 100644--- a/manager/src/main/java/org/openremote/manager/system/HealthStatusResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/system/StatusResourceImpl.java@@ -20,18 +20,32 @@package org.openremote.manager.system;import org.openremote.model.system.HealthStatusProvider;-import org.openremote.model.system.HealthStatusResource;+import org.openremote.model.system.StatusResource;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Values;+import java.io.IOException;+import java.io.InputStream;import java.util.List;+import java.util.Properties;+import java.util.logging.Level;+import java.util.logging.Logger;-public class HealthStatusResourceImpl implements HealthStatusResource {+public class StatusResourceImpl implements StatusResource {+ private static final Logger LOG = Logger.getLogger(StatusResourceImpl.class.getName());protected List<HealthStatusProvider> healthStatusProviderList;+ protected Properties versionProps = new Properties();- public HealthStatusResourceImpl(List<HealthStatusProvider> healthStatusProviderList) {+ public StatusResourceImpl(List<HealthStatusProvider> healthStatusProviderList) {this.healthStatusProviderList = healthStatusProviderList;++ try(InputStream resourceStream = StatusResourceImpl.class.getClassLoader().getResourceAsStream("system.properties")) {+ versionProps.load(resourceStream);+ } catch (IOException e) {+ LOG.log(Level.SEVERE, "Failed to load manager version properties file: system.properties");+ throw new IllegalStateException("Missing manager system.properties file");+ }}@Override@@ -48,4 +62,12 @@ public class HealthStatusResourceImpl implements HealthStatusResource {return objectValue;}++ @Override+ public ObjectValue getInfo() {+ String version = versionProps.getProperty("version");+ ObjectValue objectValue = Values.createObject();+ objectValue.put("version", version);+ return objectValue;+ }}diff --git a/manager/src/main/resources/system.properties b/manager/src/main/resources/system.propertiesnew file mode 100644index 000000000..317fe995b--- /dev/null+++ b/manager/src/main/resources/system.properties@@ -0,0 +1 @@+version=3.0.0\ No newline at end of filediff --git a/model/src/main/java/org/openremote/model/system/HealthStatusResource.java b/model/src/main/java/org/openremote/model/system/StatusResource.javasimilarity index 87%rename from model/src/main/java/org/openremote/model/system/HealthStatusResource.javarename to model/src/main/java/org/openremote/model/system/StatusResource.javaindex 1c25e01e8..a687e1c27 100644--- a/model/src/main/java/org/openremote/model/system/HealthStatusResource.java+++ b/model/src/main/java/org/openremote/model/system/StatusResource.java@@ -28,11 +28,18 @@ import javax.ws.rs.Produces;import static javax.ws.rs.core.MediaType.APPLICATION_JSON;-@Path("health")-public interface HealthStatusResource {+@Path("")+public interface StatusResource {+ @Path("health")@GET@Produces(APPLICATION_JSON)@SuccessStatusCode(200)ObjectValue getHealthStatus();++ @Path("info")+ @GET+ @Produces(APPLICATION_JSON)+ @SuccessStatusCode(200)+ ObjectValue getInfo();}