Merge pull request #105 from companieshouse/bugfix/dateTimeFix

use generic read/write converters

src/main/java/uk/gov/companieshouse/pscdataapi/config/ApplicationConfig.java

@@ -15,8 +15,10 @@
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import uk.gov.companieshouse.api.InternalApiClient;
 import uk.gov.companieshouse.api.api.CompanyMetricsApiService;
+import uk.gov.companieshouse.api.converter.EnumWriteConverter;
 import uk.gov.companieshouse.pscdataapi.converter.CompanyPscReadConverter;
 import uk.gov.companieshouse.pscdataapi.converter.CompanyPscWriteConverter;
+import uk.gov.companieshouse.pscdataapi.models.PscData;
 import uk.gov.companieshouse.pscdataapi.serialization.LocalDateDeSerializer;
 import uk.gov.companieshouse.pscdataapi.serialization.LocalDateSerializer;
 import uk.gov.companieshouse.sdk.manager.ApiSdkManager;
@@ -33,7 +35,8 @@ public class ApplicationConfig {
     public MongoCustomConversions mongoCustomConversions() {
         ObjectMapper objectMapper = mongoDbObjectMapper();
         return new MongoCustomConversions(List.of(new CompanyPscWriteConverter(objectMapper),
-                new CompanyPscReadConverter(objectMapper)));
+                new CompanyPscReadConverter(objectMapper, PscData.class),
+                new EnumWriteConverter()));
     }
 
     @Bean

src/main/java/uk/gov/companieshouse/pscdataapi/converter/CompanyPscReadConverter.java

@@ -3,28 +3,17 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.bson.Document;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.ReadingConverter;
+import uk.gov.companieshouse.api.company.Data;
+import uk.gov.companieshouse.api.converter.ReadConverter;
+import uk.gov.companieshouse.api.delta.Psc;
 import uk.gov.companieshouse.api.psc.FullRecordCompanyPSCApi;
 import uk.gov.companieshouse.pscdataapi.exceptions.FailedToConvertException;
+import uk.gov.companieshouse.pscdataapi.models.PscData;
 
-public class CompanyPscReadConverter implements Converter<Document, FullRecordCompanyPSCApi> {
-
-    private final ObjectMapper objectMapper;
-
-    public CompanyPscReadConverter(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
-
-    /**
-     * Read convertor.
-     * @param source source Document.
-     * @return psc API object.
-     */
-    @Override
-    public FullRecordCompanyPSCApi convert(Document source) {
-        try {
-            return objectMapper.readValue(source.toJson(), FullRecordCompanyPSCApi.class);
-        } catch (Exception ex) {
-            throw new FailedToConvertException(ex.getMessage());
-        }
+@ReadingConverter
+public class CompanyPscReadConverter extends ReadConverter<PscData> {
+    public CompanyPscReadConverter(ObjectMapper objectMapper, Class<PscData> objectClass) {
+        super(objectMapper, objectClass);
     }
-}
+}

src/main/java/uk/gov/companieshouse/pscdataapi/converter/CompanyPscWriteConverter.java

@@ -3,28 +3,16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mongodb.BasicDBObject;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.WritingConverter;
+import uk.gov.companieshouse.api.company.Data;
+import uk.gov.companieshouse.api.converter.WriteConverter;
 import uk.gov.companieshouse.pscdataapi.exceptions.FailedToConvertException;
+import uk.gov.companieshouse.pscdataapi.models.PscData;
 import uk.gov.companieshouse.pscdataapi.models.PscDocument;
 
-public class CompanyPscWriteConverter implements Converter<PscDocument, BasicDBObject> {
-
-    private final ObjectMapper objectMapper;
-
+@WritingConverter
+public class CompanyPscWriteConverter extends WriteConverter<PscData> {
     public CompanyPscWriteConverter(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
-
-    /**
-     * Write convertor.
-     * @param source source Document.
-     * @return psc BSON object.
-     */
-    @Override
-    public BasicDBObject convert(PscDocument source) {
-        try {
-            return BasicDBObject.parse(objectMapper.writeValueAsString(source));
-        } catch (Exception ex) {
-            throw new FailedToConvertException(ex.getMessage());
-        }
+        super(objectMapper);
     }
 }