Customize the Jackson2ObjectMapperBuilder instead of replacing it

generators/cleanup.js

@@ -4,10 +4,11 @@ const constants = require('./generator-constants'),
     ANGULAR_DIR = constants.ANGULAR_DIR;
 
 module.exports = {
-    cleanupOldFiles: cleanupOldFiles
+    cleanupOldFiles: cleanupOldFiles,
+    cleanupOldServerFiles: cleanupOldServerFiles
 };
 /**
- * Removes files that where generated in previous JHipster versions and therefore needs to be removed
+ * Removes files that where generated in previous JHipster versions and therefore need to be removed
  */
 function cleanupOldFiles(generator, javaDir, testDir) {
     if (generator.isJhipsterVersionLessThan('3.1.1')) {
@@ -16,3 +17,13 @@ function cleanupOldFiles(generator, javaDir, testDir) {
         generator.removeFile(ANGULAR_DIR + 'components/form/uib-pagination.config.js');
     }
 }
+
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore need to be removed
+ */
+function cleanupOldServerFiles(generator, javaDir, testDir) {
+    if (generator.isJhipsterVersionLessThan('3.4.3')) {
+        generator.removeFile(javaDir + 'domain/util/JSR310DateTimeSerializer.java');
+        generator.removeFile(javaDir + 'domain/util/JSR310LocalDateDeserializer.java');
+    }
+}

generators/server/index.js

@@ -5,6 +5,7 @@ var util = require('util'),
     _ = require('lodash'),
     prompts = require('./prompts'),
     scriptBase = require('../generator-base'),
+    cleanup = require('../cleanup'),
     packagejs = require('../../package.json'),
     crypto = require('crypto'),
     mkdirp = require('mkdirp');
@@ -343,6 +344,10 @@ module.exports = JhipsterServerGenerator.extend({
 
     writing: {
 
+        cleanupOldServerFiles: function() {
+            cleanup.cleanupOldServerFiles(this, this.javaDir, this.testDir);
+        },
+
         writeGlobalFiles: function () {
             this.template('_README.md', 'README.md', this, {});
             this.copy('gitignore', '.gitignore');
@@ -672,8 +677,6 @@ module.exports = JhipsterServerGenerator.extend({
             this.template(SERVER_MAIN_SRC_DIR + 'package/domain/_package-info.java', javaDir + 'domain/package-info.java', this, {});
 
             this.template(SERVER_MAIN_SRC_DIR + 'package/domain/util/_JSR310DateConverters.java', javaDir + 'domain/util/JSR310DateConverters.java', this, {});
-            this.template(SERVER_MAIN_SRC_DIR + 'package/domain/util/_JSR310DateTimeSerializer.java', javaDir + 'domain/util/JSR310DateTimeSerializer.java', this, {});
-            this.template(SERVER_MAIN_SRC_DIR + 'package/domain/util/_JSR310LocalDateDeserializer.java', javaDir + 'domain/util/JSR310LocalDateDeserializer.java', this, {});
             if (this.databaseType === 'sql') {
                 this.template(SERVER_MAIN_SRC_DIR + 'package/domain/util/_JSR310PersistenceConverters.java', javaDir + 'domain/util/JSR310PersistenceConverters.java', this, {});
                 this.template(SERVER_MAIN_SRC_DIR + 'package/domain/util/_FixedH2Dialect.java', javaDir + 'domain/util/FixedH2Dialect.java', this, {});

generators/server/templates/src/main/java/package/config/_JacksonConfiguration.java

@@ -1,27 +1,49 @@
 package <%=packageName%>.config;
 
-import <%=packageName%>.domain.util.*;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import java.time.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.ZonedDateTimeSerializer;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import javax.annotation.PostConstruct;
+
 @Configuration
 public class JacksonConfiguration {
 
+    public static final DateTimeFormatter ISO_FIXED_FORMAT =
+        DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").withZone(ZoneId.of("Z"));
+
+    public static final DateTimeFormatter ISO_DATE_OPTIONAL_TIME =
+         new DateTimeFormatterBuilder()
+            .append(DateTimeFormatter.ISO_LOCAL_DATE)
+            .optionalStart()
+            .appendLiteral('T')
+            .append(DateTimeFormatter.ISO_TIME)
+            .toFormatter();
+
+    @Autowired
+    private Jackson2ObjectMapperBuilder builder;
+
+    //To be replaced by a Jackson2ObjectMapperBuilderCustomizer in Spring-boot 1.4
+    @PostConstruct
+    public void postConstruct() {
+        this.builder.serializers(new ZonedDateTimeSerializer(ISO_FIXED_FORMAT));
+        //Will not be needed anymore with SB 1.4 (Jackson > 2.7.1)
+        this.builder.deserializerByType(LocalDate.class, new LocalDateDeserializer(ISO_DATE_OPTIONAL_TIME));
+    }
+
     @Bean
-    Jackson2ObjectMapperBuilder jackson2ObjectMapperBuilder() {
-        JavaTimeModule module = new JavaTimeModule();
-        module.addSerializer(OffsetDateTime.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addSerializer(ZonedDateTime.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addSerializer(LocalDateTime.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addSerializer(Instant.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addDeserializer(LocalDate.class, JSR310LocalDateDeserializer.INSTANCE);
-        return new Jackson2ObjectMapperBuilder()
-                .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
-                .findModulesViaServiceLoader(true)
-                .modulesToInstall(module);
+    public ObjectMapper jacksonObjectMapper() {
+        return this.builder.createXmlMapper(false).build();
     }
+
 }

generators/server/templates/src/main/resources/config/_application-dev.yml

@@ -34,6 +34,8 @@ spring:
             enabled: true
         livereload:
             enabled: false # we use gulp + BrowserSync for livereload
+    jackson:
+        serialization.indent_output: true
     <%_ if (databaseType == 'sql') { _%>
     datasource:
         <%_ if (devDatabaseType == 'mysql') { _%>

generators/server/templates/src/main/resources/config/_application.yml

@@ -40,6 +40,8 @@ spring:
         # Otherwise, it will be filled in by <%= buildTool %> when building the WAR file
         # Either way, it can be overridden by `--spring.profiles.active` value passed in the commandline or `-Dspring.profiles.active` set in `JAVA_OPTS`
         active: #spring.profiles.active#
+    jackson:
+        serialization.write_dates_as_timestamps: false
     <%_ if (databaseType == 'sql') { _%>
     jpa:
         open-in-view: false

generators/server/templates/src/test/java/package/web/rest/_TestUtil.java

@@ -1,20 +1,20 @@
 package <%=packageName%>.web.rest;
 
-import <%=packageName%>.domain.util.JSR310DateTimeSerializer;
-import <%=packageName%>.domain.util.JSR310LocalDateDeserializer;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.ZonedDateTimeSerializer;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.springframework.http.MediaType;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.time.Instant;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
 
+import static <%=packageName%>.config.JacksonConfiguration.ISO_DATE_OPTIONAL_TIME;
+import static <%=packageName%>.config.JacksonConfiguration.ISO_FIXED_FORMAT;
+
 /**
  * Utility class for testing REST controllers.
  */
@@ -39,11 +39,8 @@ public static byte[] convertObjectToJsonBytes(Object object)
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
         JavaTimeModule module = new JavaTimeModule();
-        module.addSerializer(OffsetDateTime.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addSerializer(ZonedDateTime.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addSerializer(LocalDateTime.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addSerializer(Instant.class, JSR310DateTimeSerializer.INSTANCE);
-        module.addDeserializer(LocalDate.class, JSR310LocalDateDeserializer.INSTANCE);
+        module.addSerializer(ZonedDateTime.class, new ZonedDateTimeSerializer(ISO_FIXED_FORMAT));
+        module.addDeserializer(LocalDate.class, new LocalDateDeserializer(ISO_DATE_OPTIONAL_TIME));
         mapper.registerModule(module);
 
         return mapper.writeValueAsBytes(object);

generators/server/templates/src/test/resources/config/_application.yml

@@ -26,6 +26,8 @@ spring:
     autoconfigure:
         exclude: org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration, org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration
     <%_ } _%>
+    jackson:
+        serialization.write_dates_as_timestamps: false
     <%_ if (databaseType == 'sql') { _%>
     datasource:
         url: jdbc:h2:mem:<%= baseName %>;DB_CLOSE_DELAY=-1

test/test-creation.js

@@ -95,8 +95,6 @@ const expectedFiles = {
         SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/domain/PersistentToken.java',
         SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/domain/User.java',
         SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/domain/util/JSR310DateConverters.java',
-        SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/domain/util/JSR310DateTimeSerializer.java',
-        SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/domain/util/JSR310LocalDateDeserializer.java',
         SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/domain/util/JSR310PersistenceConverters.java',
         SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/repository/package-info.java',
         SERVER_MAIN_SRC_DIR + 'com/mycompany/myapp/repository/AuthorityRepository.java',