| ... |
... |
@@ -31,7 +31,14 @@ import fr.ird.observe.services.service.AddSqlScriptProducerResult; |
|
31
|
31
|
import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest;
|
|
32
|
32
|
import fr.ird.observe.services.service.SqlScriptProducerService;
|
|
33
|
33
|
import fr.ird.observe.services.topia.ObserveServiceTopia;
|
|
|
34
|
+import java.io.ByteArrayOutputStream;
|
|
|
35
|
+import java.io.IOException;
|
|
|
36
|
+import java.io.OutputStreamWriter;
|
|
|
37
|
+import java.io.Writer;
|
|
34
|
38
|
import java.nio.charset.StandardCharsets;
|
|
|
39
|
+import java.util.Set;
|
|
|
40
|
+import java.util.stream.Collectors;
|
|
|
41
|
+import java.util.zip.GZIPOutputStream;
|
|
35
|
42
|
import org.apache.commons.logging.Log;
|
|
36
|
43
|
import org.apache.commons.logging.LogFactory;
|
|
37
|
44
|
import org.nuiton.topia.service.sql.batch.SqlRequests;
|
| ... |
... |
@@ -40,13 +47,6 @@ import org.nuiton.topia.service.sql.batch.TopiaSqlBatchService; |
|
40
|
47
|
import org.nuiton.topia.service.sql.batch.actions.BlobsContainer;
|
|
41
|
48
|
import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument;
|
|
42
|
49
|
|
|
43
|
|
-import java.io.ByteArrayOutputStream;
|
|
44
|
|
-import java.io.IOException;
|
|
45
|
|
-import java.io.OutputStreamWriter;
|
|
46
|
|
-import java.io.Writer;
|
|
47
|
|
-import java.util.Set;
|
|
48
|
|
-import java.util.stream.Collectors;
|
|
49
|
|
-import java.util.zip.GZIPOutputStream;
|
|
50
|
50
|
|
|
51
|
51
|
import static fr.ird.observe.entities.Entities.IS_LONGLINE_ID;
|
|
52
|
52
|
import static fr.ird.observe.entities.Entities.IS_SEINE_ID;
|
| ... |
... |
@@ -98,7 +98,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement |
|
98
|
98
|
}
|
|
99
|
99
|
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
|
|
100
|
100
|
|
|
101
|
|
- try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out))) {
|
|
|
101
|
+ try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out), StandardCharsets.UTF_8)) {
|
|
102
|
102
|
|
|
103
|
103
|
TopiaSqlBatchService sqlBatchService = serviceContext.getTopiaApplicationContext().getSqlBatchService();
|
|
104
|
104
|
SqlRequests.Builder builder = sqlBatchService.requestBuilder().to(writer);
|
| ... |
... |
@@ -115,7 +115,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement |
|
115
|
115
|
}
|
|
116
|
116
|
}
|
|
117
|
117
|
|
|
118
|
|
- protected SqlRequests sqlRequests(AddSqlScriptProducerRequest request, SqlRequests.Builder builder) {
|
|
|
118
|
+ private SqlRequests sqlRequests(AddSqlScriptProducerRequest request, SqlRequests.Builder builder) {
|
|
119
|
119
|
|
|
120
|
120
|
boolean h2 = request.isH2();
|
|
121
|
121
|
|
| ... |
... |
@@ -193,7 +193,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement |
|
193
|
193
|
return builder.build();
|
|
194
|
194
|
}
|
|
195
|
195
|
|
|
196
|
|
- protected SqlRequests sqlRequests(DeleteSqlScriptProducerRequest request, SqlRequests.Builder builder) {
|
|
|
196
|
+ private SqlRequests sqlRequests(DeleteSqlScriptProducerRequest request, SqlRequests.Builder builder) {
|
|
197
|
197
|
|
|
198
|
198
|
ObserveTopiaApplicationContext topiaApplicationContext = serviceContext.getTopiaApplicationContext();
|
|
199
|
199
|
|