Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Updated AssetModelProvider interface

Rich Turnerd1754bd41499
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetModel.java b/manager/src/main/java/org/openremote/manager/asset/AssetModel.java
index 0b3d9814f..bb1aa2dc5 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetModel.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetModel.java
@@ -64,7 +64,7 @@ public class AssetModel {
List<AssetDescriptor> assetTypeList = new ArrayList<>();
ServiceLoader.load(AssetModelProvider.class).forEach(assetModelProvider -> {
LOG.fine("Adding asset type descriptors of: " + assetModelProvider);
- assetTypeList.addAll(Arrays.asList(assetModelProvider.getAssetTypeDescriptors()));
+ assetTypeList.addAll(Arrays.asList(assetModelProvider.getAssetDescriptors()));
});
WELL_KNOWN_ASSET_TYPES = assetTypeList.toArray(new AssetDescriptor[assetTypeList.size()]);
diff --git a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
index 647e64cb7..3bc760b0b 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetModelProvider.java
@@ -30,7 +30,7 @@ public interface AssetModelProvider {
MetaItemDescriptor[] getMetaItemDescriptors();
- AssetDescriptor[] getAssetTypeDescriptors();
+ AssetDescriptor[] getAssetDescriptors();
AttributeDescriptor[] getAttributeDescriptors();
diff --git a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java
index 58665d703..4cd0107fe 100644
--- a/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java
+++ b/model/src/main/java/org/openremote/model/asset/DefaultAssetModelProvider.java
@@ -32,7 +32,7 @@ public class DefaultAssetModelProvider implements AssetModelProvider {
}
@Override
- public AssetDescriptor[] getAssetTypeDescriptors() {
+ public AssetDescriptor[] getAssetDescriptors() {
return AssetType.values();
}