Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 857afc9a by Tony CHEMIT at 2017-06-13T12:10:46+02:00 Set charset when creating a delete script (See #729) - - - - - 1 changed file: - services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/SqlScriptProducerServiceTopia.java @@ -31,7 +31,14 @@ import fr.ird.observe.services.service.AddSqlScriptProducerResult; import fr.ird.observe.services.service.DeleteSqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; import java.nio.charset.StandardCharsets; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.zip.GZIPOutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.service.sql.batch.SqlRequests; @@ -40,13 +47,6 @@ import org.nuiton.topia.service.sql.batch.TopiaSqlBatchService; import org.nuiton.topia.service.sql.batch.actions.BlobsContainer; import org.nuiton.topia.service.sql.batch.actions.TopiaSqlTableSelectArgument; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.zip.GZIPOutputStream; import static fr.ird.observe.entities.Entities.IS_LONGLINE_ID; import static fr.ird.observe.entities.Entities.IS_SEINE_ID; @@ -98,7 +98,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement } try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { - try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out))) { + try (Writer writer = new OutputStreamWriter(new GZIPOutputStream(out), StandardCharsets.UTF_8)) { TopiaSqlBatchService sqlBatchService = serviceContext.getTopiaApplicationContext().getSqlBatchService(); SqlRequests.Builder builder = sqlBatchService.requestBuilder().to(writer); @@ -115,7 +115,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement } } - protected SqlRequests sqlRequests(AddSqlScriptProducerRequest request, SqlRequests.Builder builder) { + private SqlRequests sqlRequests(AddSqlScriptProducerRequest request, SqlRequests.Builder builder) { boolean h2 = request.isH2(); @@ -193,7 +193,7 @@ public class SqlScriptProducerServiceTopia extends ObserveServiceTopia implement return builder.build(); } - protected SqlRequests sqlRequests(DeleteSqlScriptProducerRequest request, SqlRequests.Builder builder) { + private SqlRequests sqlRequests(DeleteSqlScriptProducerRequest request, SqlRequests.Builder builder) { ObserveTopiaApplicationContext topiaApplicationContext = serviceContext.getTopiaApplicationContext(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/857afc9ad536f878b98fff2f713d... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/857afc9ad536f878b98fff2f713d... You're receiving this email because of your account on gitlab.com.