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
Fix typescript generation (#1014)
Rich Turner09cb7ec745ee
diff --git a/gradle.properties b/gradle.propertiesindex 43fa4f3ee..09e078418 100644--- a/gradle.properties+++ b/gradle.properties@@ -41,7 +41,7 @@ geotoolsVersion = 19.1firebaseAdminVersion = 9.1.1jakartaMailVersion = 2.0.1jaywayJsonPathVersion = 2.7.0-typescriptGeneratorVersion = 2.28.785+typescriptGeneratorVersion = 3.2.1263californiumCoreVersion = 2.1.0californiumScandiumVersion = 3.5.0zwaveVersion = 3.4.0-SNAPSHOTdiff --git a/model/src/main/java/org/openremote/model/asset/Asset.java b/model/src/main/java/org/openremote/model/asset/Asset.javaindex 23979d6fc..b330fbc59 100644--- a/model/src/main/java/org/openremote/model/asset/Asset.java+++ b/model/src/main/java/org/openremote/model/asset/Asset.java@@ -34,6 +34,7 @@ import org.openremote.model.geo.GeoJSONPoint;import org.openremote.model.jackson.AssetTypeIdResolver;import org.openremote.model.persistence.LTreeType;import org.openremote.model.util.TsIgnore;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.util.ValueUtil;import org.openremote.model.validation.AssetValid;import org.openremote.model.value.AttributeDescriptor;@@ -212,6 +213,7 @@ import static org.openremote.model.Constants.*;@JsonTypeIdResolver(AssetTypeIdResolver.class)@AssetValid(groups = Asset.AssetSave.class)@DynamicUpdate+@TsIgnoreTypeParams@SuppressWarnings("unchecked")public abstract class Asset<T extends Asset<?>> implements IdentifiableEntity<T> {diff --git a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.javaindex 53cf4df21..098c08338 100644--- a/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java+++ b/model/src/main/java/org/openremote/model/asset/AssetDescriptor.java@@ -31,6 +31,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;import com.fasterxml.jackson.databind.deser.std.StdDeserializer;import org.openremote.model.asset.agent.AgentDescriptor;import org.openremote.model.util.TsIgnore;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.value.NameHolder;import org.openremote.model.util.ValueUtil;@@ -51,6 +52,7 @@ import java.io.IOException;@JsonSubTypes.Type(AgentDescriptor.class)})@JsonDeserialize(using = AssetDescriptor.AssetDescriptorDeserialiser.class)+@TsIgnoreTypeParamspublic class AssetDescriptor<T extends Asset<?>> implements NameHolder {@TsIgnorediff --git a/model/src/main/java/org/openremote/model/asset/AssetFilter.java b/model/src/main/java/org/openremote/model/asset/AssetFilter.javaindex 62b790788..b831f9a46 100644--- a/model/src/main/java/org/openremote/model/asset/AssetFilter.java+++ b/model/src/main/java/org/openremote/model/asset/AssetFilter.java@@ -24,6 +24,7 @@ import org.openremote.model.event.shared.AssetInfo;import org.openremote.model.event.shared.EventFilter;import org.openremote.model.event.shared.SharedEvent;import org.openremote.model.util.TextUtil;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.MetaItemDescriptor;import org.openremote.model.value.MetaItemType;@@ -33,6 +34,7 @@ import java.util.List;import java.util.stream.Collectors;// TODO: Merge this with AssetQuery and use AssetQueryPredicate to resolve+@TsIgnoreTypeParamspublic class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<T> {public static final String FILTER_TYPE = "asset";diff --git a/model/src/main/java/org/openremote/model/asset/agent/Agent.java b/model/src/main/java/org/openremote/model/asset/agent/Agent.javaindex 3865dbf38..977616c57 100644--- a/model/src/main/java/org/openremote/model/asset/agent/Agent.java+++ b/model/src/main/java/org/openremote/model/asset/agent/Agent.java@@ -24,6 +24,7 @@ import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;import org.openremote.model.auth.OAuthGrant;import org.openremote.model.auth.UsernamePassword;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.AttributeDescriptor;import org.openremote.model.value.MetaItemType;@@ -39,6 +40,7 @@ import static org.openremote.model.value.MetaItemType.AGENT_LINK;* providing an instance of the associated {@link Protocol} when requested via {@link #getProtocolInstance}.*/@SuppressWarnings("unchecked")+@TsIgnoreTypeParamspublic abstract class Agent<T extends Agent<T, U, V>, U extends Protocol<T>, V extends AgentLink<?>> extends Asset<T> {public static final AttributeDescriptor<Boolean> DISABLED = new AttributeDescriptor<>("agentDisabled", ValueType.BOOLEAN);diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.javaindex dd1a8ee91..191b4487d 100644--- a/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentDescriptor.java@@ -29,11 +29,13 @@ import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.protocol.ProtocolAssetDiscovery;import org.openremote.model.protocol.ProtocolAssetImport;import org.openremote.model.protocol.ProtocolInstanceDiscovery;+import org.openremote.model.util.TsIgnoreTypeParams;/*** Special type of {@link AssetDescriptor} that describes an agent {@link Asset}.*/@JsonTypeName("agent")+@TsIgnoreTypeParamspublic class AgentDescriptor<T extends Agent<T, U, V>, U extends Protocol<T>, V extends AgentLink<?>> extends AssetDescriptor<T> {public static class DiscoveryBooleanConverter extends StdConverter<Class<?>, Boolean> {diff --git a/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java b/model/src/main/java/org/openremote/model/asset/agent/AgentLink.javaindex afacdee07..2bd0d23bf 100644--- a/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java+++ b/model/src/main/java/org/openremote/model/asset/agent/AgentLink.java@@ -28,6 +28,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject;import org.openremote.model.attribute.Attribute;import org.openremote.model.query.filter.ValuePredicate;import org.openremote.model.util.JSONSchemaUtil;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.util.ValueUtil;import org.openremote.model.value.ValueFilter;@@ -40,6 +41,7 @@ import java.util.Optional;* item and standard JSR-380 annotations should be used to provide validation logic.*/@JsonTypeInfo(property = "type", use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, defaultImpl = DefaultAgentLink.class)+@TsIgnoreTypeParamspublic abstract class AgentLink<T extends AgentLink<?>> implements Serializable {@JsonSchemaFormat("or-agent-id")diff --git a/model/src/main/java/org/openremote/model/asset/agent/Protocol.java b/model/src/main/java/org/openremote/model/asset/agent/Protocol.javaindex 4ce10aab8..4311f63ec 100644--- a/model/src/main/java/org/openremote/model/asset/agent/Protocol.java+++ b/model/src/main/java/org/openremote/model/asset/agent/Protocol.java@@ -27,6 +27,7 @@ import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeRef;import org.openremote.model.attribute.MetaItem;import org.openremote.model.syslog.SyslogCategory;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.value.MetaItemType;import org.openremote.model.value.ValueFilter;import org.openremote.model.util.ValueUtil;@@ -149,6 +150,7 @@ import static org.openremote.model.syslog.SyslogCategory.PROTOCOL;* <li>{@link #unlinkAttribute}</li>* </ol>*/+@TsIgnoreTypeParamspublic interface Protocol<T extends Agent<T, ?, ?>> {Logger LOG = SyslogCategory.getLogger(PROTOCOL, Protocol.class);diff --git a/model/src/main/java/org/openremote/model/event/Event.java b/model/src/main/java/org/openremote/model/event/Event.javaindex 37ca58b2e..5e6434907 100644--- a/model/src/main/java/org/openremote/model/event/Event.java+++ b/model/src/main/java/org/openremote/model/event/Event.java@@ -19,6 +19,7 @@*/package org.openremote.model.event;+import com.fasterxml.jackson.annotation.JsonIgnore;import org.openremote.model.util.TextUtil;import jakarta.persistence.Column;@@ -59,6 +60,7 @@ public abstract class Event {return getEventType(eventClass.getSimpleName());}+ @JsonIgnorefinal public String getEventType() {return getEventType(getClass());}diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.javaindex 60acfe1c2..d5e0b2490 100644--- a/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningConfig.java@@ -24,14 +24,12 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;import com.fasterxml.jackson.annotation.JsonTypeInfo;import com.fasterxml.jackson.databind.annotation.JsonDeserialize;import com.vladmihalcea.hibernate.type.array.StringArrayType;-import org.openremote.model.Constants;-import org.openremote.model.security.ClientRole;-import jakarta.persistence.*;import jakarta.validation.constraints.Min;import jakarta.validation.constraints.NotNull;import jakarta.validation.constraints.Size;-import java.util.Arrays;+import org.openremote.model.security.ClientRole;+import java.util.Date;import static jakarta.persistence.DiscriminatorType.STRING;diff --git a/model/src/main/java/org/openremote/model/provisioning/ProvisioningUtil.java b/model/src/main/java/org/openremote/model/provisioning/ProvisioningUtil.javaindex 58eee4bd4..46e3ed283 100644--- a/model/src/main/java/org/openremote/model/provisioning/ProvisioningUtil.java+++ b/model/src/main/java/org/openremote/model/provisioning/ProvisioningUtil.java@@ -19,6 +19,8 @@*/package org.openremote.model.provisioning;+import org.openremote.model.util.TsIgnore;+import javax.naming.InvalidNameException;import javax.naming.ldap.LdapName;import javax.naming.ldap.Rdn;@@ -33,6 +35,7 @@ import java.security.cert.X509Certificate;import java.util.logging.Level;import java.util.logging.Logger;+@TsIgnorepublic class ProvisioningUtil {protected static final Logger LOG = Logger.getLogger(ProvisioningUtil.class.getName());diff --git a/model/src/main/java/org/openremote/model/util/TsIgnoreTypeParams.java b/model/src/main/java/org/openremote/model/util/TsIgnoreTypeParams.javanew file mode 100644index 000000000..c3039d51d--- /dev/null+++ b/model/src/main/java/org/openremote/model/util/TsIgnoreTypeParams.java@@ -0,0 +1,35 @@+/*+ * Copyright 2021, OpenRemote Inc.+ *+ * See the CONTRIBUTORS.txt file in the distribution for a+ * full listing of individual contributors.+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <http://www.gnu.org/licenses/>.+ */+package org.openremote.model.util;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++/**+ * Annotation for telling the typescript generator to ignore type parameters of the annotated class; if no+ * {@link #paramIndexes} are specified then all type parameters are ignored.+ */+@Target({ElementType.TYPE})+@Retention(RetentionPolicy.RUNTIME)+public @interface TsIgnoreTypeParams {+ int[] paramIndexes() default {};+}diff --git a/model/src/main/java/org/openremote/model/value/AbstractNameValueDescriptorHolder.java b/model/src/main/java/org/openremote/model/value/AbstractNameValueDescriptorHolder.javaindex 339f93178..6fe5f97c0 100644--- a/model/src/main/java/org/openremote/model/value/AbstractNameValueDescriptorHolder.java+++ b/model/src/main/java/org/openremote/model/value/AbstractNameValueDescriptorHolder.java@@ -24,10 +24,12 @@ import com.fasterxml.jackson.annotation.JsonInclude;import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.annotation.JsonDeserialize;import com.fasterxml.jackson.databind.annotation.JsonSerialize;+import org.openremote.model.util.TsIgnoreTypeParams;import java.util.Arrays;import java.util.Objects;+@TsIgnoreTypeParamspublic abstract class AbstractNameValueDescriptorHolder<T> implements ValueDescriptorHolder<T>, NameHolder {@JsonIgnorediff --git a/model/src/main/java/org/openremote/model/value/AttributeDescriptor.java b/model/src/main/java/org/openremote/model/value/AttributeDescriptor.javaindex 94d84ad6e..4000e1c31 100644--- a/model/src/main/java/org/openremote/model/value/AttributeDescriptor.java+++ b/model/src/main/java/org/openremote/model/value/AttributeDescriptor.java@@ -23,6 +23,7 @@ import org.openremote.model.asset.Asset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;import org.openremote.model.attribute.MetaMap;+import org.openremote.model.util.TsIgnoreTypeParams;import java.util.Arrays;import java.util.Collection;@@ -39,6 +40,7 @@ import java.util.Collection;* associated e.g. an {@link AttributeDescriptor} with the name 'location' cannot be added to any {@link Asset} type as* it is already associated with the {@link Asset} class itself see {@link Asset#LOCATION})*/+@TsIgnoreTypeParamspublic class AttributeDescriptor<T> extends AbstractNameValueDescriptorHolder<T> implements MetaHolder {protected MetaMap meta;diff --git a/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.java b/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.javaindex 281333480..ee16222e4 100644--- a/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.java+++ b/model/src/main/java/org/openremote/model/value/MetaItemDescriptor.java@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.util.StdConverter;import org.openremote.model.asset.Asset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.util.ValueUtil;/**@@ -34,6 +35,7 @@ import org.openremote.model.util.ValueUtil;* <p>* {@link MetaItemDescriptor#getName} must be globally unique within the context of the manager it is registered with.*/+@TsIgnoreTypeParamspublic class MetaItemDescriptor<T> extends AbstractNameValueDescriptorHolder<T> {/**diff --git a/model/src/main/java/org/openremote/model/value/ValueDescriptor.java b/model/src/main/java/org/openremote/model/value/ValueDescriptor.javaindex 27f688a40..c03c58255 100644--- a/model/src/main/java/org/openremote/model/value/ValueDescriptor.java+++ b/model/src/main/java/org/openremote/model/value/ValueDescriptor.java@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.util.StdConverter;import org.openremote.model.asset.Asset;import org.openremote.model.attribute.Attribute;import org.openremote.model.attribute.MetaItem;+import org.openremote.model.util.TsIgnoreTypeParams;import org.openremote.model.util.ValueUtil;import java.io.Serializable;@@ -46,6 +47,7 @@ import java.util.*;* {@link ValueDescriptor#getName} must be globally unique within the context of the manager it is registered with.*///@JsonDeserialize(using = ValueDescriptor.ValueDescriptorDeserialiser.class)+@TsIgnoreTypeParamspublic class ValueDescriptor<T> implements NameHolder, Serializable {/**diff --git a/model/src/main/java/org/openremote/model/value/ValueDescriptorHolder.java b/model/src/main/java/org/openremote/model/value/ValueDescriptorHolder.javaindex d0fe9c5ec..d4b3c91b6 100644--- a/model/src/main/java/org/openremote/model/value/ValueDescriptorHolder.java+++ b/model/src/main/java/org/openremote/model/value/ValueDescriptorHolder.java@@ -22,10 +22,12 @@ package org.openremote.model.value;import com.fasterxml.jackson.annotation.JsonProperty;import com.fasterxml.jackson.databind.annotation.JsonDeserialize;import com.fasterxml.jackson.databind.annotation.JsonSerialize;+import org.openremote.model.util.TsIgnoreTypeParams;/*** Identifies an item that holds a {@link ValueDescriptor}.*/+@TsIgnoreTypeParamspublic interface ValueDescriptorHolder<T> {@JsonPropertydiff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradleindex a9a38a76b..9904e1d17 100644--- a/ui/component/model/build.gradle+++ b/ui/component/model/build.gradle@@ -38,8 +38,11 @@ generateTypeScript {"org.openremote.model.event.shared.*Filter**","org.openremote.model.util.**","org.openremote.model.flow.**",- "java.io.Serializable",- "java.lang.Comparable"+ "java.io.**",+ "java.lang.**",+ "org.hibernate.**",+ "com.vladmihalcea.**",+ "jakarta.**"]customTypeProcessor = "CustomTypeProcessor"customTypeNamingFunction = "function(name, simpleName) { if (name.indexOf(\"\$\") > 0) return name.substr(name.lastIndexOf(\".\")+1).replace(\"\$\",\"\"); }"diff --git a/ui/component/model/src/main/java/Constants.java b/ui/component/model/src/main/java/Constants.javadeleted file mode 100644index 853a3f6a4..000000000--- a/ui/component/model/src/main/java/Constants.java+++ /dev/null@@ -1,50 +0,0 @@-/*- * Copyright 2021, OpenRemote Inc.- *- * See the CONTRIBUTORS.txt file in the distribution for a- * full listing of individual contributors.- *- * This program is free software: you can redistribute it and/or modify- * it under the terms of the GNU Affero General Public License as- * published by the Free Software Foundation, either version 3 of the- * License, or (at your option) any later version.- *- * This program is distributed in the hope that it will be useful,- * but WITHOUT ANY WARRANTY; without even the implied warranty of- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- * GNU Affero General Public License for more details.- *- * You should have received a copy of the GNU Affero General Public License- * along with this program. If not, see <http://www.gnu.org/licenses/>.- */--import org.openremote.model.asset.Asset;-import org.openremote.model.asset.AssetDescriptor;-import org.openremote.model.asset.AssetFilter;-import org.openremote.model.asset.agent.Agent;-import org.openremote.model.asset.agent.AgentDescriptor;-import org.openremote.model.asset.agent.AgentLink;-import org.openremote.model.asset.agent.Protocol;-import org.openremote.model.value.*;--import java.util.Arrays;-import java.util.List;--public final class Constants {- protected Constants() {}-- public static final List<Class<?>> IGNORE_TYPE_PARAMS_ON_CLASSES = Arrays.asList(- Asset.class,- Agent.class,- AssetFilter.class,- AssetDescriptor.class,- AgentDescriptor.class,- AgentLink.class,- Protocol.class,- AttributeDescriptor.class,- MetaItemDescriptor.class,- ValueDescriptor.class,- ValueDescriptorHolder.class,- AbstractNameValueDescriptorHolder.class- );-}diff --git a/ui/component/model/src/main/java/CustomExtension.java b/ui/component/model/src/main/java/CustomExtension.javaindex c4cc19701..45fbde349 100644--- a/ui/component/model/src/main/java/CustomExtension.java+++ b/ui/component/model/src/main/java/CustomExtension.java@@ -26,14 +26,18 @@ import cz.habarta.typescript.generator.emitter.EmitterExtensionFeatures;import cz.habarta.typescript.generator.emitter.TsBeanModel;import cz.habarta.typescript.generator.emitter.TsPropertyModel;import org.openremote.model.asset.AssetTypeInfo;+import org.openremote.model.provisioning.X509ProvisioningConfig;+import org.openremote.model.util.TsIgnoreTypeParams;import java.util.Arrays;+import java.util.Collections;import java.util.List;/**- * Does some custom processing for our specific model:+ * Does some custom processing for our specific model and fixes any anomalies in the plugin itself:* <ul>- * <li>Removes type params from classes in {@link Constants#IGNORE_TYPE_PARAMS_ON_CLASSES}</li>+ * <li>Removes some or all type params from classes annotated with {@link TsIgnoreTypeParams}+ * <li>Special processing for AssetModelInfo meta item value descriptors as JsonSerialize extension doesn't support @JsonSerialize(contentConverter=...)* </ul>*/public class CustomExtension extends Extension {@@ -46,24 +50,41 @@ public class CustomExtension extends Extension {@Overridepublic List<TransformerDefinition> getTransformers() {return Arrays.asList(+ // This is a hack to fix breaking change with latest version of this plugin+ new TransformerDefinition(ModelCompiler.TransformationPhase.AfterDeclarationSorting, (TsModelTransformer) (context, model) -> {+ TsBeanModel provBean = model.getBean(X509ProvisioningConfig.class);+ if (provBean != null) {+ provBean.getExtendsList().remove(0);+ provBean.getExtendsList().add(provBean.getParent());+ }+ return model;+ }),new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeEnums, (TsModelTransformer) (context, model) -> {- // Special processing for AssetModelInfo meta item value descriptors as JsonSerialize extension doesn't support- // @JsonSerialize(contentConverter=...)TsBeanModel assetTypeInfoBean = model.getBean(AssetTypeInfo.class);-if (assetTypeInfoBean != null) {assetTypeInfoBean.getProperties().replaceAll(p -> p.getName().equals("metaItemDescriptors") || p.getName().equals("valueDescriptors") ? new TsPropertyModel(p.getName(), new TsType.BasicArrayType(TsType.String), p.modifiers, p.ownProperty, p.comments) : p);}- Constants.IGNORE_TYPE_PARAMS_ON_CLASSES.forEach(beanClass -> {- TsBeanModel bean = model.getBean(beanClass);+ // Remove the type parameter - this works in conjunction with the CustomTypeProcessor which replaces+ // field references+ model.getBeans().replaceAll(bean -> {- if (bean != null && bean.getTypeParameters() != null) {- // Remove the type parameter - this works in conjunction with the CustomTypeProcessor which replaces- // field references- bean.getTypeParameters().clear();+ if (bean.getOrigin() != null && bean.getOrigin().getAnnotation(TsIgnoreTypeParams.class) != null) {+ if (bean.getTypeParameters() != null) {+ TsIgnoreTypeParams ignoreTypeParams = bean.getOrigin().getAnnotation(TsIgnoreTypeParams.class);+ if (ignoreTypeParams.paramIndexes().length == 0) {+ bean.getTypeParameters().clear();+ } else {+ Arrays.stream(ignoreTypeParams.paramIndexes())+ .boxed()+ .sorted(Collections.reverseOrder())+ .forEach(index -> bean.getTypeParameters().remove(index.intValue()));+ }+ }}++ return bean;});return model;diff --git a/ui/component/model/src/main/java/CustomTypeProcessor.java b/ui/component/model/src/main/java/CustomTypeProcessor.javaindex 331a9842f..aa5f17e56 100644--- a/ui/component/model/src/main/java/CustomTypeProcessor.java+++ b/ui/component/model/src/main/java/CustomTypeProcessor.java@@ -21,22 +21,23 @@import com.fasterxml.jackson.databind.JsonNode;import cz.habarta.typescript.generator.TsType;import cz.habarta.typescript.generator.TypeProcessor;+import cz.habarta.typescript.generator.util.GenericsResolver;import cz.habarta.typescript.generator.util.Utils;import org.openremote.model.util.TsIgnore;-import org.openremote.model.value.MetaItemDescriptor;-import org.openremote.model.value.ValueDescriptor;+import org.openremote.model.util.TsIgnoreTypeParams;import java.lang.reflect.ParameterizedType;import java.lang.reflect.Type;+import java.util.*;/**- * Will ignore types/super types annotated with {@link TsIgnore} as well as types that extend/implement the following- * super types:+ * Does some custom processing for our specific model and fixes any anomalies in the plugin itself:* <ul>- * <li>Any type with a super type in the "com.fasterxml.jackson" package excluding those implementing {@link com.fasterxml.jackson.databind.JsonNode}</li>+ * <li>Ignore types/super types annotated with {@link TsIgnore}+ * <li>Will ignore types with a super type in the "com.fasterxml.jackson" package excluding those implementing {@link com.fasterxml.jackson.databind.JsonNode}</li>+ * <li>Removes some or all type params from classes annotated with {@link TsIgnoreTypeParams}+ * <li>Special processing for AssetModelInfo meta item value descriptors as JsonSerialize extension doesn't support @JsonSerialize(contentConverter=...)* </ul>- * <p>- * Also removes type parameters from field types listed in {@link Constants#IGNORE_TYPE_PARAMS_ON_CLASSES}*/public class CustomTypeProcessor implements TypeProcessor {@@ -69,9 +70,36 @@ public class CustomTypeProcessor implements TypeProcessor {rawClass = Utils.getRawClassOrNull(javaType);- if (Constants.IGNORE_TYPE_PARAMS_ON_CLASSES.contains(rawClass)) {- if (javaType instanceof ParameterizedType) {- return new Result(new TsType.BasicType(rawClass.getSimpleName()));+ if (javaType instanceof ParameterizedType) {++ // Exclude type params+ TsIgnoreTypeParams ignoreTypeParams = rawClass.getAnnotation(TsIgnoreTypeParams.class);++ if (ignoreTypeParams != null) {++ if (ignoreTypeParams.paramIndexes().length == 0) {+ // Ignore all+ return new Result(new TsType.BasicType(rawClass.getSimpleName()));+ }++ // Ignore specified+ final ParameterizedType parameterizedType = (ParameterizedType) javaType;+ List<Integer> removeIndexes = Arrays.stream(ignoreTypeParams.paramIndexes()).boxed().toList();++ if (parameterizedType.getRawType() instanceof final Class<?> javaClass) {+ final List<Class<?>> discoveredClasses = new ArrayList<>();+ discoveredClasses.add(javaClass);+ final Type[] typeArguments = parameterizedType.getActualTypeArguments();+ final List<TsType> tsTypeArguments = new ArrayList<>();+ for (int i=0; i<typeArguments.length; i++) {+ if (!removeIndexes.contains(i)) {+ final TypeProcessor.Result typeArgumentResult = context.processType(typeArguments[i]);+ tsTypeArguments.add(typeArgumentResult.getTsType());+ discoveredClasses.addAll(typeArgumentResult.getDiscoveredClasses());+ }+ }+ return new Result(new TsType.GenericReferenceType(context.getSymbol(javaClass), tsTypeArguments), discoveredClasses);+ }}}diff --git a/ui/component/model/src/main/java/EnumWithInterfacesExtension.java b/ui/component/model/src/main/java/EnumWithInterfacesExtension.javaindex 4ca746796..de9ca94b2 100644--- a/ui/component/model/src/main/java/EnumWithInterfacesExtension.java+++ b/ui/component/model/src/main/java/EnumWithInterfacesExtension.java@@ -13,6 +13,7 @@ import cz.habarta.typescript.generator.*;import cz.habarta.typescript.generator.compiler.ModelCompiler;import cz.habarta.typescript.generator.compiler.ModelTransformer;import cz.habarta.typescript.generator.compiler.SymbolTable;+import cz.habarta.typescript.generator.compiler.TsModelTransformer;import cz.habarta.typescript.generator.emitter.*;import cz.habarta.typescript.generator.util.Pair;import cz.habarta.typescript.generator.util.Utils;@@ -202,9 +203,9 @@ public class EnumWithInterfacesExtension extends Extension {@Overridepublic List<TransformerDefinition> getTransformers() {- return Arrays.asList(new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeEnums, new ModelTransformer() {+ return Arrays.asList(new TransformerDefinition(ModelCompiler.TransformationPhase.BeforeEnums, new TsModelTransformer() {@Override- public TsModel transformModel(SymbolTable symbolTable, TsModel model) {+ public TsModel transformModel(Context context, TsModel model) {List<TsEnumModel> enums = model.getEnums();for (TsEnumModel enm : enums) {diff --git a/ui/component/model/src/main/java/JsonSerializeExtension.java b/ui/component/model/src/main/java/JsonSerializeExtension.javaindex 3d11a092c..73995f5e6 100644--- a/ui/component/model/src/main/java/JsonSerializeExtension.java+++ b/ui/component/model/src/main/java/JsonSerializeExtension.java@@ -56,11 +56,6 @@ public class JsonSerializeExtension extends cz.habarta.typescript.generator.Extepublic List<cz.habarta.typescript.generator.Extension.TransformerDefinition> getTransformers() {return Arrays.asList(new cz.habarta.typescript.generator.Extension.TransformerDefinition(ModelCompiler.TransformationPhase.BeforeTsModel, new ModelTransformer() {- @Override- public TsModel transformModel(SymbolTable symbolTable, TsModel model) {- return model;- }-@Overridepublic Model transformModel(SymbolTable symbolTable, Model model) {// Look for @JsonSerialize annotation and modify the property type accordinglydiff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex 9eaf913ae..e2425d53e 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -37,8 +37,11 @@ task generateTypescriptModelInfo(type: cz.habarta.typescript.generator.gradle.Ge"org.openremote.model.event.shared.*Filter**","org.openremote.model.util.**","org.openremote.model.flow.**",- "java.io.Serializable",- "java.lang.Comparable"+ "java.io.**",+ "java.lang.**",+ "org.hibernate.**",+ "com.vladmihalcea.**",+ "jakarta.**"]customTypeProcessor = "CustomTypeProcessor"customTypeNamingFunction = "function(name, simpleName) { if (name.indexOf(\"\$\") > 0) return name.substr(name.lastIndexOf(\".\")+1).replace(\"\$\",\"\"); }"@@ -81,11 +84,14 @@ generateTypeScript {"org.openremote.model.event.shared.*Filter**","org.openremote.model.util.**","org.openremote.model.flow.**",- "java.io.Serializable",- "java.lang.Comparable"+ "java.io.**",+ "java.lang.**",+ "org.hibernate.**",+ "com.vladmihalcea.**",+ "jakarta.**"]moduleDependencies = [- new cz.habarta.typescript.generator.ModuleDependency(+ cz.habarta.typescript.generator.ModuleDependency.module("@openremote/model","Model",new File("$buildDir/typescript-generator/typescript-generator-info.json"),