Skip to content

Using discovered jackson2 modules #112

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

Merged
merged 1 commit into from
Jan 28, 2017
Merged

Using discovered jackson2 modules #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions sample-maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,17 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.7.4</version>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate5</artifactId>
<version>2.8.6</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.2.6.Final</version>
</dependency>
</dependencies>

Expand All @@ -21,7 +31,7 @@
<plugin>
<groupId>cz.habarta.typescript-generator</groupId>
<artifactId>typescript-generator-maven-plugin</artifactId>
<version>1.10-SNAPSHOT</version>
<version>1.15-SNAPSHOT</version>
<executions>
<execution>
<id>generate</id>
Expand All @@ -31,6 +41,7 @@
<phase>process-classes</phase>
<configuration>
<jsonLibrary>jackson2</jsonLibrary>
<disableJackson2ModuleDiscovery>false</disableJackson2ModuleDiscovery>
<classes>
<class>cz.habarta.typescript.generator.sample.Person</class>
</classes>
Expand Down
3 changes: 3 additions & 0 deletions sample-maven/src/main/java/cz/habarta/typescript/generator/sample/Person.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ public class Person {
public List<String> tags;
public Map<String, String> emails;

@javax.persistence.Transient
public String excluded;

}
2 changes: 2 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 @@ -48,6 +48,8 @@ public class Settings {
public List<Class<? extends Annotation>> includePropertyAnnotations = new ArrayList<>();
public List<Class<? extends Annotation>> optionalAnnotations = new ArrayList<>();
public boolean displaySerializerWarning = true;
public boolean disableJackson2ModuleDiscovery = false;
public ClassLoader classLoader = null;


public void setStringQuotes(StringQuotes quotes) {
Expand Down
3 changes: 3 additions & 0 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 @@ -36,6 +36,9 @@ public Jackson2Parser(Settings settings, TypeProcessor typeProcessor) {

public Jackson2Parser(Settings settings, TypeProcessor typeProcessor, boolean useJaxbAnnotations) {
super(settings, typeProcessor);
if (!settings.disableJackson2ModuleDiscovery) {
objectMapper.registerModules(ObjectMapper.findModules(settings.classLoader));
}
if (useJaxbAnnotations) {
AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(objectMapper.getTypeFactory());
objectMapper.setAnnotationIntrospector(introspector);
Expand Down
3 changes: 3 additions & 0 deletions ...ator-gradle-plugin/src/main/java/cz/habarta/typescript/generator/gradle/GenerateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public class GenerateTask extends DefaultTask {
public List<String> optionalAnnotations;
public StringQuotes stringQuotes;
public boolean displaySerializerWarning = true;
public boolean disableJackson2ModuleDiscovery;

@TaskAction
public void generate() throws Exception {
Expand Down Expand Up @@ -106,6 +107,8 @@ public void generate() throws Exception {
settings.loadOptionalAnnotations(classLoader, optionalAnnotations);
settings.setStringQuotes(stringQuotes);
settings.displaySerializerWarning = displaySerializerWarning;
settings.disableJackson2ModuleDiscovery = disableJackson2ModuleDiscovery;
settings.classLoader = classLoader;
settings.validateFileName(new File(outputFile));

// TypeScriptGenerator
Expand Down
8 changes: 8 additions & 0 deletions ...erator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ public class GenerateMojo extends AbstractMojo {
@Parameter(defaultValue = "true")
private boolean displaySerializerWarning;

/**
* Turns off Jackson2 automatic module discovery.
*/
@Parameter
private boolean disableJackson2ModuleDiscovery;

@Parameter(defaultValue = "${project}", readonly = true, required = true)
private MavenProject project;

Expand Down Expand Up @@ -342,6 +348,8 @@ public void execute() {
settings.loadOptionalAnnotations(classLoader, optionalAnnotations);
settings.setStringQuotes(stringQuotes);
settings.displaySerializerWarning = displaySerializerWarning;
settings.disableJackson2ModuleDiscovery = disableJackson2ModuleDiscovery;
settings.classLoader = classLoader;
settings.validateFileName(outputFile);

// TypeScriptGenerator
Expand Down