Code formatted after merge #2

gemimeg-backend/src/main/java/de/ptb/common/dcc/controller/CalibrationCertificateController.java

@@ -79,6 +79,22 @@ public class CalibrationCertificateController {
     this.service = service;
   }
 
+  private static String getDetailedXmlError(String xml, Exception e) {
+    StringBuilder details = new StringBuilder(createLogEntry(e));
+    if (e instanceof JAXBException && (((JAXBException) e).getLinkedException() instanceof SAXParseException)) {
+      int line = ((SAXParseException) ((JAXBException) e).getLinkedException()).getLineNumber();
+      details.append(" Invalid xml: (line ").append(line).append(") :").append(System.lineSeparator());
+      Object[] xmlLines = xml.lines().toArray();
+      for (int i = Math.max(0, line - 3); i <= Math.min(xmlLines.length - 1, line + 3); i++) {
+        details.append(i).append(": ").append(xmlLines[i].toString()).append(System.lineSeparator());
+      }
+    }
+    String detailsMessage = details.toString();
+    log.error("Problem detected with provided XML: " + detailsMessage);
+    log.error("Problematic XML: " + xml);
+    return detailsMessage;
+  }
+
   @Operation(description = "Convert a DCC DTO as JSON to XML")
   @PostMapping(path = DCC_XML_PATH, consumes = APPLICATION_JSON_VALUE, produces = APPLICATION_XML_VALUE)
   public String convertAndValidate(@RequestBody CalibrationCertificateDto dcc) {
@@ -130,20 +146,4 @@ public class CalibrationCertificateController {
       throw new BadRequestStatus(createLogEntry(e));
     }
   }
-
-  private static String getDetailedXmlError(String xml, Exception e) {
-    StringBuilder details = new StringBuilder(createLogEntry(e));
-    if (e instanceof JAXBException && (((JAXBException) e).getLinkedException() instanceof SAXParseException)) {
-      int line = ((SAXParseException) ((JAXBException) e).getLinkedException()).getLineNumber();
-      details.append(" Invalid xml: (line ").append(line).append(") :").append(System.lineSeparator());
-      Object[] xmlLines = xml.lines().toArray();
-      for (int i = Math.max(0, line - 3); i <= Math.min(xmlLines.length - 1, line + 3); i++) {
-        details.append(i).append(": ").append(xmlLines[i].toString()).append(System.lineSeparator());
-      }
-    }
-    String detailsMessage = details.toString();
-    log.error("Problem detected with provided XML: " + detailsMessage);
-    log.error("Problematic XML: " + xml);
-    return detailsMessage;
-  }
 }

gemimeg-backend/src/main/resources/xsd/ds/1.2/xmldsig-core-schema.xsd

@@ -27,8 +27,8 @@
   OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+<schema xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        xmlns="http://www.w3.org/2001/XMLSchema"
         targetNamespace="http://www.w3.org/2000/09/xmldsig#"
         version="0.1" elementFormDefault="qualified">
   <simpleType name="CryptoBinary">

gemimeg-backend/src/test/java/de/ptb/common/dcc/data/CalibrationCertificateRepositoryTest.java

@@ -34,7 +34,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 
 import java.util.Date;
@@ -45,16 +44,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 @DataJpaTest
 class CalibrationCertificateRepositoryTest {
 
+  private final long currentTimeMillis = System.currentTimeMillis();
   @Autowired
   private CalibrationCertificateRepository repository;
-
   @Autowired
   private CalibrationCertificateConfiguration configuration;
-
   private String expiredId;
 
-  private final long currentTimeMillis = System.currentTimeMillis();
-
   @BeforeEach
   void setUp() {
     long expiredTimeMillis = currentTimeMillis - configuration.getPersistLifespan().longValue() * 1001L;

gemimeg-backend/src/test/java/de/ptb/common/dcc/service/CacheServiceTest.java

@@ -66,24 +66,19 @@ import static org.mockito.Mockito.when;
 @SpringBootTest
 class CacheServiceTest {
 
+  private final Long cacheItemId = RandomUtils.nextLong();
+  private final Date createdAt = new Date(System.currentTimeMillis());
   @MockBean
   private VersionConfiguration versionConfiguration;
-
   @MockBean
   private CacheConfiguration configuration;
-
   @MockBean
   private CacheItemRepository repository;
-
   @Captor
   private ArgumentCaptor<Date> dateCaptor;
-
   private CacheService service;
   private CacheItem cacheItem;
 
-  private final Long cacheItemId = RandomUtils.nextLong();
-  private final Date createdAt = new Date(System.currentTimeMillis());
-
   @BeforeEach
   void setUp() {
     when(versionConfiguration.getArtifactId()).thenReturn("cache-service-test");

gemimeg-backend/src/test/resources/examples/formulaMapperTest/xmlType_raw.json

-{"any":"<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n \n<head>\n<title>MathML's Hello Square</title>\n</head>\n\n<body>\n\n<p> This is a perfect square:</p>\n\n<math xmlns=\"http://www.w3.org/1998/Math/MathML\">\n <mrow>\n   <msup>\n     <mfenced>\n       <mrow>\n         <mi>a</mi>\n         <mo>+</mo>\n         <mi>b</mi>\n       </mrow>\n     </mfenced>\n     <mn>2</mn>\n   </msup>\n </mrow> \n</math>\n\n</body>\n</html>"}
+{
\ No newline at end of file
+  "any" : "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n \n<head>\n<title>MathML's Hello Square</title>\n</head>\n\n<body>\n\n<p> This is a perfect square:</p>\n\n<math xmlns=\"http://www.w3.org/1998/Math/MathML\">\n <mrow>\n   <msup>\n     <mfenced>\n       <mrow>\n         <mi>a</mi>\n         <mo>+</mo>\n         <mi>b</mi>\n       </mrow>\n     </mfenced>\n     <mn>2</mn>\n   </msup>\n </mrow> \n</math>\n\n</body>\n</html>"
+}
\ No newline at end of file