Merge pull request #12 from com-pas/Fix_special_Characters_In_IID_File

Bug: Special characters should be added to the decompressed string
com-pas · Jul 3, 2023 · 2cfe09f · 2cfe09f
2 parents 66795f2 + 6bd70de
commit 2cfe09f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -152,6 +152,9 @@ SPDX-License-Identifier: Apache-2.0
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${surefire-plugin.version}</version>
+                    <configuration>
+                        <argLine>-Dfile.encoding=UTF-8</argLine>
+                    </configuration>
                 </plugin>
 
                 <plugin>

diff --git a/service/src/main/java/org/lfenergy/compas/sitipe/service/ImportedComponentService.java b/service/src/main/java/org/lfenergy/compas/sitipe/service/ImportedComponentService.java
@@ -15,13 +15,8 @@
 import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.NotFoundException;
 import java.io.*;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
-import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
-import java.util.zip.ZipInputStream;
 
 @ApplicationScoped
 public class ImportedComponentService {
@@ -49,28 +44,26 @@ public ImportedDataDTO getImportedComponentData(final Integer id) {
             throw new NotFoundException("Imported BT Component not found");
         }
 
+        return new ImportedDataDTO(this.getData(importedComponent));
+    }
+
+    private String getData(final ImportedComponent importedComponent) {
         final ByteArrayInputStream bais = new ByteArrayInputStream(importedComponent.getData());
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         final InflaterInputStream iis = new InflaterInputStream(bais);
 
-        StringBuilder result = new StringBuilder();
-        byte[] buffer = new byte[5];
-
-        int rlen = -1;
+        int data;
+        int stopByte = -1;
 
         try {
-            while ((rlen = iis.read(buffer)) != -1) {
-                result.append(new String(Arrays.copyOf(buffer, rlen), StandardCharsets.ISO_8859_1));
+            while (stopByte != (data = iis.read())) {
+                baos.write(data);
             }
         } catch (IOException e) {
             throw new InternalServerErrorException(e);
         }
 
-        return new ImportedDataDTO(
-            new String(result.toString().getBytes(), StandardCharsets.UTF_8)
-                .replaceAll("[^\\x00-\\x7F]", "")
-        );
-
-
+        return baos.toString();
     }
 
     @Transactional

diff --git a/service/src/test/java/org/lfenergy/compas/sitipe/service/ImportedComponentServiceTest.java b/service/src/test/java/org/lfenergy/compas/sitipe/service/ImportedComponentServiceTest.java
@@ -88,6 +88,21 @@ void itShouldGetById() throws IOException {
         assertEquals(data, result.getData());
     }
 
+    @Test
+    void itShouldGetByIdWithSpecialCharacters() throws IOException {
+        final Integer id = 1;
+        final String data = "<temperature><message>It's currently 5°C outside!</message><northpole> 1μ°C</northpole></temperatur>";
+        ImportedComponent importedComponent = new ImportedComponent();
+        importedComponent.setId(id);
+        importedComponent.setData(compress(data.getBytes(StandardCharsets.UTF_8)));
+
+        when(importedComponentRepository.getById(id))
+                .thenReturn(importedComponent);
+
+        ImportedDataDTO result = sut.getImportedComponentData(id);
+
+        assertEquals(data, result.getData());
+    }
     @Test
     void itShouldThrowErrorWhenImportedComponentNotFound() {
         when(importedComponentRepository.getById(any())).thenReturn(null);