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
Renamed Values to ValueUtil
Rich Turner85624cfb5cba
diff --git a/ui/component/model/src/main/java/AssetModelInfoExtension.java b/ui/component/model/src/main/java/AssetModelInfoExtension.javaindex d182e3b34..f1bb0c7c0 100644--- a/ui/component/model/src/main/java/AssetModelInfoExtension.java+++ b/ui/component/model/src/main/java/AssetModelInfoExtension.java@@ -25,8 +25,8 @@ import cz.habarta.typescript.generator.emitter.TsModel;import org.openremote.agent.protocol.AgentModelProvider;import org.openremote.model.Constants;import org.openremote.model.rules.Ruleset;+import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaItemDescriptor;-import org.openremote.model.value.Values;import java.util.*;import java.util.concurrent.atomic.AtomicInteger;@@ -39,9 +39,9 @@ public class AssetModelInfoExtension extends Extension {public AssetModelInfoExtension() {// Service loader doesn't seem to work so manually load the agent model provider- Values.getModelProviders().add(new AgentModelProvider());+ ValueUtil.getModelProviders().add(new AgentModelProvider());// Ensure the asset model is initialised- Values.initialise();+ ValueUtil.initialise();}@Override@@ -58,7 +58,7 @@ public class AssetModelInfoExtension extends Extension {Map<String, String> assetMap = new HashMap<>();Map<String, String> otherMap = new HashMap<>();- Arrays.stream(Values.getAssetInfos(null)).forEach(assetModelInfo -> {+ Arrays.stream(ValueUtil.getAssetInfos(null)).forEach(assetModelInfo -> {String assetDescriptorName = assetModelInfo.getAssetDescriptor().getName();assetMap.put(assetDescriptorName.toUpperCase(Locale.ROOT), assetDescriptorName);@@ -75,7 +75,7 @@ public class AssetModelInfoExtension extends Extension {emitEnum(writer, "WellknownAttributes", otherMap);otherMap.clear();- Arrays.stream(Values.getMetaItemDescriptors()).forEach(metaItemDescriptor -> {+ Arrays.stream(ValueUtil.getMetaItemDescriptors()).forEach(metaItemDescriptor -> {String metaName = metaItemDescriptor.getName();otherMap.put(metaName.toUpperCase(Locale.ROOT), metaName);});@@ -83,7 +83,7 @@ public class AssetModelInfoExtension extends Extension {emitEnum(writer, "WellknownMetaItems", otherMap);otherMap.clear();- Arrays.stream(Values.getValueDescriptors()).forEach(valueDescriptor -> {+ Arrays.stream(ValueUtil.getValueDescriptors()).forEach(valueDescriptor -> {String valueTypeName = valueDescriptor.getName();otherMap.put(valueTypeName.toUpperCase(Locale.ROOT).replaceAll("[^A-Z0-9]", ""), valueTypeName);});