From c676a8675124230f6402c5ddbccac07d8135c2fe Mon Sep 17 00:00:00 2001 From: pkupczyk <piotr.kupczyk@id.ethz.ch> Date: Fri, 8 Dec 2023 15:34:10 +0100 Subject: [PATCH] BIS-757 : Write Translator to TypeScript - include duplicated classes with different names --- api-openbis-java/build.gradle | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/api-openbis-java/build.gradle b/api-openbis-java/build.gradle index 4566adf36ba..967eea87100 100644 --- a/api-openbis-java/build.gradle +++ b/api-openbis-java/build.gradle @@ -66,23 +66,22 @@ generateTypeScript { 'ch.ethz.sis.openbis.generic.dssapi.v3.dto.**', 'ch.ethz.sis.openbis.generic.OpenBIS', ] - - excludeClassPatterns = ["**.v1.**", - "**.generic.shared.**", - "ch.ethz.sis.openbis.generic.asapi.v3.dto.session.search.PersonalAccessTokenSessionNameSearchCriteria", - "ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search.ExternalDmsSearchCriteria", - "ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.search.ExternalDmsSearchCriteria", - "ch.ethz.sis.openbis.generic.dssapi.v3.dto.common.operation.IOperationResult", - "ch.ethz.sis.openbis.generic.dssapi.v3.dto.service.execute.AbstractExecutionOptionsWithParameters", - "ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SampleIdDeserializer", - "ch.ethz.sis.openbis.generic.asapi.v3.dto.common.property.PropertiesDeserializer"] + excludeClassPatterns = [ + "ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SampleIdDeserializer", + "ch.ethz.sis.openbis.generic.asapi.v3.dto.common.property.PropertiesDeserializer"] mapClasses = "asInterfaces" outputKind = 'module' outputFileType = 'declarationFile' customTypeNaming = [ "ch.ethz.sis.openbis.generic.OpenBIS:facade", + "ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.search.PersonalAccessTokenSessionNameSearchCriteria:PersonalAccessTokenSessionNameSearchCriteria", + "ch.ethz.sis.openbis.generic.asapi.v3.dto.session.search.PersonalAccessTokenSessionNameSearchCriteria:PersonalAccessTokenSessionNameSearchCriteriaInSession", "ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.search.ExternalDmsSearchCriteria:ExternalDmsSearchCriteria", - "ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search.ExternalDmsSearchCriteria:DSExternalDmsSearchCriteria" + "ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search.ExternalDmsSearchCriteria:ExternalDmsSearchCriteriaInDataSet", + "ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute.AbstractExecutionOptionsWithParameters:AbstractExecutionOptionsWithParameters", + "ch.ethz.sis.openbis.generic.dssapi.v3.dto.service.execute.AbstractExecutionOptionsWithParameters:AbstractExecutionOptionsWithParametersInDataStore", + "ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult:IOperationResult", + "ch.ethz.sis.openbis.generic.dssapi.v3.dto.common.operation.IOperationResult:IOperationResultInDataStore" ] extensionsWithConfiguration = [ new ConfiguredExtension(className: 'ch.empa.tsprocessor.AddMethodsExtension', configuration: ['asyncClasses': "[\"ch.ethz.sis.openbis.generic.OpenBIS\"]"]), -- GitLab