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
Changed AppConfig to ConsoleAppConfig
Michael Rademakercff723e02afc
diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.javaindex 43c900c41..b2b8d8bf2 100644--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppResourceImpl.java@@ -20,7 +20,7 @@package org.openremote.manager.apps;import org.openremote.container.web.WebResource;-import org.openremote.model.apps.AppConfig;+import org.openremote.model.apps.ConsoleAppConfig;import org.openremote.model.apps.ConsoleAppResource;import org.openremote.model.http.RequestParams;@@ -49,7 +49,7 @@ public class ConsoleAppResourceImpl extends WebResource implements ConsoleAppRes}@Override- public AppConfig getAppConfig(RequestParams requestParams) {+ public ConsoleAppConfig getAppConfig(RequestParams requestParams) {try {return consoleAppService.getAppConfig(getRequestRealm());} catch (Exception ex) {diff --git a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.javaindex 91f16b267..dcb20ce0a 100644--- a/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java+++ b/manager/src/main/java/org/openremote/manager/apps/ConsoleAppService.java@@ -25,8 +25,7 @@ import org.openremote.container.persistence.PersistenceService;import org.openremote.container.timer.TimerService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.web.ManagerWebService;-import org.openremote.model.apps.AppConfig;-import org.openremote.model.datapoint.AssetDatapoint;+import org.openremote.model.apps.ConsoleAppConfig;import java.nio.file.Files;import java.util.logging.Logger;@@ -73,12 +72,12 @@ public class ConsoleAppService implements ContainerService {.toArray(String[]::new);}- public AppConfig getAppConfig(String realm) {+ public ConsoleAppConfig getAppConfig(String realm) {return persistenceService.doReturningTransaction(entityManager ->entityManager.createQuery(- "select ac from AppConfig ac " ++ "select ac from ConsoleAppConfig ac " +"where ac.realm = :realm",- AppConfig.class)+ ConsoleAppConfig.class).setParameter("realm", realm).getResultList()).stream().findFirst().orElse(null);}diff --git a/manager/src/main/resources/META-INF/persistence.xml b/manager/src/main/resources/META-INF/persistence.xmlindex 624b7c058..1ce5ec456 100644--- a/manager/src/main/resources/META-INF/persistence.xml+++ b/manager/src/main/resources/META-INF/persistence.xml@@ -23,7 +23,7 @@<class>org.openremote.model.rules.AssetRuleset</class><class>org.openremote.model.syslog.SyslogEvent</class><class>org.openremote.model.gateway.GatewayConnection</class>- <class>org.openremote.model.apps.AppConfig</class>+ <class>org.openremote.model.apps.ConsoleAppConfig</class><exclude-unlisted-classes>true</exclude-unlisted-classes>diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sqlindex 721b3e321..3d57caef0 100644--- a/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql+++ b/manager/src/main/resources/org/openremote/manager/setup/database/V20191202_01__Schema.sql@@ -141,7 +141,7 @@ create table GATEWAY_CONNECTION (primary key (LOCAL_REALM));-create table APP_CONFIG (+create table CONSOLE_APP_CONFIG (ID int8 not null,REALM varchar(255) not null,URL varchar(255) not null,diff --git a/model/src/main/java/org/openremote/model/apps/AppConfig.java b/model/src/main/java/org/openremote/model/apps/ConsoleAppConfig.javasimilarity index 92%rename from model/src/main/java/org/openremote/model/apps/AppConfig.javarename to model/src/main/java/org/openremote/model/apps/ConsoleAppConfig.javaindex 48819cec5..a13f434e5 100644--- a/model/src/main/java/org/openremote/model/apps/AppConfig.java+++ b/model/src/main/java/org/openremote/model/apps/ConsoleAppConfig.java@@ -8,8 +8,8 @@ import static org.openremote.model.Constants.PERSISTENCE_JSON_OBJECT_TYPE;import static org.openremote.model.Constants.PERSISTENCE_SEQUENCE_ID_GENERATOR;@Entity-@Table(name = "APP_CONFIG")-public class AppConfig {+@Table(name = "CONSOLE_APP_CONFIG")+public class ConsoleAppConfig {public enum MenuPosition {BOTTOM_LEFT,@@ -18,7 +18,7 @@ public class AppConfig {TOP_RIGHT}- public AppConfig() {+ public ConsoleAppConfig() {}@Iddiff --git a/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java b/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.javaindex a12f4091a..9cabe693b 100644--- a/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java+++ b/model/src/main/java/org/openremote/model/apps/ConsoleAppResource.java@@ -48,5 +48,5 @@ public interface ConsoleAppResource {@Path("config")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- AppConfig getAppConfig(@BeanParam RequestParams requestParams);+ ConsoleAppConfig getAppConfig(@BeanParam RequestParams requestParams);}