reworked logic for exporter factory so that all exporters are spring …

…initialized beans
imi-ms · Jan 30, 2025 · b65e913 · b65e913
1 parent 5176015
commit b65e913
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 16 deletions.
diff --git a/src/main/java/de/imi/mopat/controller/QuestionnaireController.java b/src/main/java/de/imi/mopat/controller/QuestionnaireController.java
@@ -162,6 +162,9 @@ public class QuestionnaireController {
     @Autowired
     private ODMProcessingBean odmReader;
 
+    @Autowired
+    private MetadataExporterFactory metadataExporterFactory;
+
     /**
      * Controls the HTTP GET requests for the URL <i>/questionnaire/list</i>. Shows the list of
      * questionnaires.
@@ -410,7 +413,7 @@ public ResponseEntity<ByteArrayResource> downloadQuestionnaire(
         }
 
         // Get the bytearray of the selected questionnaire in the selected type
-        MetadataExporter exporter = MetadataExporterFactory.getMetadataExporter(
+        MetadataExporter exporter = metadataExporterFactory.getMetadataExporter(
             MetadataFormat.valueOf(type));
 
         for (Question question : questionnaire.getQuestions()) {

diff --git a/src/main/java/de/imi/mopat/helper/model/JSONHelper.java b/src/main/java/de/imi/mopat/helper/model/JSONHelper.java
@@ -21,14 +21,14 @@
 import de.imi.mopat.model.dto.export.JsonScoreDTO;
 import de.imi.mopat.model.score.Score;
 import java.io.IOException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class JSONHelper {
 
-    private final ConfigurationDao configurationDao;
-
-    public JSONHelper(final ConfigurationDao configurationDao) {
-        this.configurationDao = configurationDao;
-    }
+    @Autowired
+    private ConfigurationDao configurationDao;
 
     public void initializeJsonQuestionnaireDTO(JsonQuestionnaireDTO jsonQuestionnaireDTO,
         final Questionnaire questionnaire) {

diff --git a/src/main/java/de/imi/mopat/io/impl/MetadataExporterFHIR.java b/src/main/java/de/imi/mopat/io/impl/MetadataExporterFHIR.java
@@ -48,14 +48,17 @@
 import org.hl7.fhir.exceptions.FHIRException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * An exporter for FHIR metadata reprasentation of a {@link Questionnaire}.
  */
+@Service
 public class MetadataExporterFHIR implements MetadataExporter {
 
     private static final org.slf4j.Logger LOGGER =
-            org.slf4j.LoggerFactory.getLogger(MetadataExporterPDF.class);
+            org.slf4j.LoggerFactory.getLogger(MetadataExporterFHIR.class);
     private final String ANSWER_OID = "MoPat/Answer/";
 
     @Autowired

diff --git a/src/main/java/de/imi/mopat/io/impl/MetadataExporterFactory.java b/src/main/java/de/imi/mopat/io/impl/MetadataExporterFactory.java
@@ -2,30 +2,47 @@
 
 import de.imi.mopat.io.MetadataExporter;
 import de.imi.mopat.model.enumeration.MetadataFormat;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * A factory to get a {@link MetadataExporter} for a specific {@link MetadataFormat}.
  */
+@Service
 public class MetadataExporterFactory {
 
+    @Autowired
+    private MetadataExporterMoPat metadataExporterMoPat;
+
+    @Autowired
+    private MetadataExporterODM metadataExporterODM;
+
+    @Autowired
+    private MetadataExporterPDF metadataExporterPDF;
+
+    @Autowired
+    private MetadataExporterFHIR metadataExporterFHIR;
+
+    @Autowired
+    private MetadataExporterODMExportTemplate metadataExporterODMExportTemplate;
     /**
      * Returns a {@link MetadataExporter} for the given {@link MetadataFormat}.
      *
      * @param metadataFormat {@link MetadataFormat} of the requested {@link MetadataExporter}
      * @return a {@link MetadataExporter} for the given {@link MetadataFormat}
      */
-    public static MetadataExporter getMetadataExporter(final MetadataFormat metadataFormat) {
+    public MetadataExporter getMetadataExporter(final MetadataFormat metadataFormat) {
         switch (metadataFormat) {
             case MoPat:
-                return new MetadataExporterMoPat();
+                return metadataExporterMoPat;
             case ODM:
-                return new MetadataExporterODM();
+                return metadataExporterODM;
             case PDF:
-                return new MetadataExporterPDF();
+                return metadataExporterPDF;
             case FHIR:
-                return new MetadataExporterFHIR();
+                return metadataExporterFHIR;
             case ODMExportTemplate:
-                return new MetadataExporterODMExportTemplate();
+                return metadataExporterODMExportTemplate;
             default:
                 return null;
         }

diff --git a/src/main/java/de/imi/mopat/io/impl/MetadataExporterMoPat.java b/src/main/java/de/imi/mopat/io/impl/MetadataExporterMoPat.java
@@ -1,5 +1,6 @@
 package de.imi.mopat.io.impl;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -22,12 +23,19 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * An exporter for a JSON representation of the metadata of a
  * {@link Questionnaire} and everything that is associated with it.
  */
+@Service
 public class MetadataExporterMoPat implements MetadataExporter {
+
+    @Autowired
+    private JSONHelper jsonHelper;
+
     private static final org.slf4j.Logger LOGGER =
             org.slf4j.LoggerFactory.getLogger(MetadataExporterMoPat.class);
 
@@ -58,7 +66,6 @@ public byte[] export(
 
             JsonQuestionnaireDTO jsonQuestionnaireDTO =
                     new JsonQuestionnaireDTO();
-            JSONHelper jsonHelper = new JSONHelper(configurationDao);
             jsonHelper.initializeJsonQuestionnaireDTO(jsonQuestionnaireDTO, questionnaire);
             jsonQuestionnaire =
                     objectMapper.writeValueAsString(jsonQuestionnaireDTO);

diff --git a/src/main/java/de/imi/mopat/io/impl/MetadataExporterODM.java b/src/main/java/de/imi/mopat/io/impl/MetadataExporterODM.java
@@ -70,6 +70,8 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * An exporter for an ODM representation of the metadata of a {@link Questionnaire}.
@@ -82,6 +84,7 @@
  * [BaseOID].[questionID].1 and [BaseOID] .[questionID].2 - other questiontypes:
  * [BaseOID].[questionID] - CodeListOID: [BaseOID] .[questionID].1
  */
+@Service
 public class MetadataExporterODM implements MetadataExporter {
 
     private BigInteger orderNumber = BigInteger.ONE;

diff --git a/src/main/java/de/imi/mopat/io/impl/MetadataExporterODMExportTemplate.java b/src/main/java/de/imi/mopat/io/impl/MetadataExporterODMExportTemplate.java
@@ -84,6 +84,8 @@
 
 import org.apache.commons.io.FileUtils;
 import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * An exporter for an ODMExportTemplate representation of the metadata of a {@link Questionnaire}.
@@ -96,6 +98,7 @@
  * [BaseOID].[questionID].1 and [BaseOID] .[questionID].2 - other questiontypes:
  * [BaseOID].[questionID] - CodeListOID: [BaseOID] .[questionID].1
  */
+@Service
 public class MetadataExporterODMExportTemplate implements MetadataExporter {
 
     private BigInteger orderNumber = BigInteger.ONE;

diff --git a/src/main/java/de/imi/mopat/io/impl/MetadataExporterPDF.java b/src/main/java/de/imi/mopat/io/impl/MetadataExporterPDF.java
@@ -22,16 +22,17 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * An exporter for a PDF representation of the metadata of a {@link Questionnaire}.
  */
+@Service
 public class MetadataExporterPDF implements MetadataExporter {
 
     private static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(
         MetadataExporterPDF.class);
-    @Autowired
-    private ServletContext servletContext;
 
     @Override
     public byte[] export(final Questionnaire questionnaire, final MessageSource messageSource,