Skip to content

- Added settings.includePropertyFunctionImpl #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

- Added settings.includePropertyFunctionImpl #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05a0f21
- Added settings.includePropertyFunctionImpl
Mar 5, 2023
425a031
- fix checkstyle
Mar 16, 2023
17104d7
Merge branch 'vojtechhabarta:main' into main
dcrousset Mar 16, 2023
98c9512
Allow simple pojo with converter serializer to be still seen as a Bea…
Mar 16, 2023
c1c505c
Merge branch 'main' of https://github.com/dcrousset/typescript-generator
Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Member;
import java.lang.reflect.TypeVariable;
import java.net.URL;
import java.net.URLClassLoader;
Expand All @@ -33,6 +34,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -118,6 +120,7 @@ public class Settings {
public List<File> javadocXmlFiles = null;
public List<EmitterExtension> extensions = new ArrayList<>();
public List<Class<? extends Annotation>> includePropertyAnnotations = new ArrayList<>();
public Function<Member,Boolean> includePropertyFunctionImpl = null;
public List<Class<? extends Annotation>> excludePropertyAnnotations = new ArrayList<>();
public List<Class<? extends Annotation>> optionalAnnotations = new ArrayList<>();
public List<Class<? extends Annotation>> requiredAnnotations = new ArrayList<>();
Expand Down
16 changes: 14 additions & 2 deletions ...t-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.fasterxml.jackson.databind.deser.CreatorProperty;
import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext;
import com.fasterxml.jackson.databind.deser.impl.BeanPropertyMap;
import com.fasterxml.jackson.databind.deser.std.StdDelegatingDeserializer;
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
import com.fasterxml.jackson.databind.jsontype.NamedType;
Expand All @@ -45,6 +46,7 @@
import com.fasterxml.jackson.databind.ser.BeanSerializer;
import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;
import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdDelegatingSerializer;
import com.fasterxml.jackson.databind.type.TypeFactory;
import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
Expand Down Expand Up @@ -275,6 +277,10 @@ private BeanModel parseBean(SourceType<Class<?>> sourceClass, List<String> class
beanProperty,
settings.jackson2Configuration != null && settings.jackson2Configuration.disableObjectIdentityFeature);

if( settings.includePropertyFunctionImpl != null && !settings.includePropertyFunctionImpl.apply( member ) ) {
continue;
}

if (!isAnnotatedPropertyIncluded(beanProperty::getAnnotation, sourceClass.type.getName() + "." + beanProperty.getName())) {
continue;
}
Expand Down Expand Up @@ -548,7 +554,10 @@ private BeanSerializerHelper createBeanSerializerHelper(JavaType javaType) {
try {
final DefaultSerializerProvider.Impl serializerProvider = new DefaultSerializerProvider.Impl()
.createInstance(objectMapper.getSerializationConfig(), objectMapper.getSerializerFactory());
final JsonSerializer<?> jsonSerializer = BeanSerializerFactory.instance.createSerializer(serializerProvider, javaType);
JsonSerializer<?> jsonSerializer = BeanSerializerFactory.instance.createSerializer(serializerProvider, javaType);
if (jsonSerializer != null && jsonSerializer instanceof StdDelegatingSerializer) {
jsonSerializer = ((StdDelegatingSerializer ) jsonSerializer).getDelegatee();
}
if (jsonSerializer != null && jsonSerializer instanceof BeanSerializer) {
return new BeanSerializerHelper((BeanSerializer) jsonSerializer);
} else {
Expand All @@ -564,7 +573,10 @@ private BeanDeserializerHelper createBeanDeserializerHelper(JavaType javaType) {
final DeserializationContext deserializationContext = new DefaultDeserializationContext.Impl(objectMapper.getDeserializationContext().getFactory())
.createInstance(objectMapper.getDeserializationConfig(), null, null);
final BeanDescription beanDescription = deserializationContext.getConfig().introspect(javaType);
final JsonDeserializer<?> jsonDeserializer = BeanDeserializerFactory.instance.createBeanDeserializer(deserializationContext, javaType, beanDescription);
JsonDeserializer<?> jsonDeserializer = BeanDeserializerFactory.instance.createBeanDeserializer(deserializationContext, javaType, beanDescription);
if (jsonDeserializer != null && jsonDeserializer instanceof StdDelegatingDeserializer) {
jsonDeserializer = ((StdDelegatingDeserializer<?> ) jsonDeserializer).getDelegatee();
}
if (jsonDeserializer != null && jsonDeserializer instanceof BeanDeserializer) {
return new BeanDeserializerHelper((BeanDeserializer) jsonDeserializer);
} else {
Expand Down