This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c8ade99126087b65d042a760b62f42a9e3abb96b Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:24:11 2018 +0200 fixes #10015 --- .../services/service/EmailServiceImpl.java | 5 +- .../services/service/EmailServiceTest.java | 9 + .../src/test/resources/emails/test10015-2.eml | 254 +++++++++++++++++++++ 3 files changed, 266 insertions(+), 2 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 1efa7668..3704ba3d 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -105,6 +105,7 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -2377,8 +2378,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } head.appendChild(style); - // convert to pdf - ITextRenderer renderer = new ITextRenderer(); + // convert to pdf use 30 dots per point in renderer to prevent long mails to be cropped on the right, cf #10015 + ITextRenderer renderer = new ITextRenderer(30,20); renderer.setDocument(doc, null); renderer.layout(); renderer.createPDF(os); diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 154de033..154141be 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -354,6 +354,15 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { } + /** + * Test qui ne fail jamais, mais permet de vérifier la génération de PDFs très larges + */ + @Test + public void test10015_2() { + testConvertHTMLToPdf("test10015-2"); + + } + protected void testConvertHTMLToPdf(String emailId) { File tempDirectory = FileUtils.getTempDirectory(); diff --git a/faxtomail-service/src/test/resources/emails/test10015-2.eml b/faxtomail-service/src/test/resources/emails/test10015-2.eml new file mode 100644 index 00000000..d6bb3977 --- /dev/null +++ b/faxtomail-service/src/test/resources/emails/test10015-2.eml @@ -0,0 +1,254 @@ +From: QUINIO Michel <Michel.Quinio@franciaflex.com> +To: ff.adv.test <test.ftmFF@france-fermetures.fr> +Subject: TR: Interrogation technique +Thread-Topic: Interrogation technique +Thread-Index: AdPyZxppWv7zD2BmQKKcftpWfyPN+wlG/MdA +Date: Mon, 9 Jul 2018 12:48:01 +0000 +Message-ID: <E7C76F0CE76FA14287E830E5381C0582F3309398@S8-EXC-P01.mac-groupe.net> +References: <D847078B20AB7B41A6E84E8EAA8DEE931316E26D@APP1337.gha.kfplc.com> +In-Reply-To: <D847078B20AB7B41A6E84E8EAA8DEE931316E26D@APP1337.gha.kfplc.com> +Content-Language: fr-FR +X-MS-Has-Attach: yes +X-MS-TNEF-Correlator: +x-ms-exchange-organization-originalclientipaddress: 192.168.110.18 +x-ms-exchange-organization-originalserveripaddress: fe80::c190:40b7:ff5:893%12 +Content-Type: multipart/mixed; + boundary="_006_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_" +MIME-Version: 1.0 + +--_006_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_ +Content-Type: multipart/related; + boundary="_005_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_"; + type="multipart/alternative" + +--_005_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_ +Content-Type: multipart/alternative; + boundary="_000_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_" + +--_000_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_ +Content-Type: text/plain; charset="iso-8859-1" +Content-Transfer-Encoding: quoted-printable + + + + + +De : Prevost, Fanny [mailto:fanny.prevost@castorama.fr] +Envoy=E9 : mercredi 23 mai 2018 09:35 +=C0 : serviceclients +Cc : Bodin, Christophe; Minerba, ALBAN +Objet : Interrogation technique + + + +Bonjour, + +Je me permet de vous contacter car j'ai mon client, M SUIRE Nicolas qui =E0= + commander en septembre des volets battant. + +Cependant, au moment de les poser il s'est aper=E7u que les pentures livr= +=E9es avec ses volets =E9taient diff=E9rentes du fait de la largeur des vol= +ets. + + +Mon client =E0 des volets de dimension 1200 mm et 1195 mm et pour 5 millim= +=E8tres en moins les pentures sont nettement plus petites ce qui g=EAne for= +tement le rendu final. +De ce fait, nous aimerions vous commander des pentures au bonnes dimensions= + soit les m=EAmes que celles avec un volet d'une largeur de 1200 mm. +Pouvez-vous m'indiquer ce que je dois mettre dans mon bon de commande pour = +nous nous comprenions dans le but d'avoir rapidement les pentures ? + + +Vous trouverez ci-joint le bon de commande initial. + +Dans l'attente de votre r=E9ponse, + +Bien cordialement, + + + +cid:image001.gif@01D3F279.14D42B50 + +Prevost Fanny + +Chef de Rayon Menuiserie ext=E9rieure +ZAC des Sablons + +77410 Claye Souilly + +T=E9l : +33 (0)1 60 94 82 66 + + + + + + +--_000_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_ +Content-Type: text/html; charset="iso-8859-1" +Content-Transfer-Encoding: quoted-printable + +<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr= +osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" = +xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:= +//www.w3.org/TR/REC-html40"> +<head> +<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Diso-8859-= +1"> +<meta name=3D"Generator" content=3D"Microsoft Word 14 (filtered medium)"> +<!--[if !mso]><style>v\:* {behavior:url(#default#VML);} +o\:* {behavior:url(#default#VML);} +w\:* {behavior:url(#default#VML);} +.shape {behavior:url(#default#VML);} +</style><![endif]--><style><!-- +/* Font Definitions */ +@font-face + {font-family:Calibri; + panose-1:2 15 5 2 2 2 4 3 2 4;} +@font-face + {font-family:Tahoma; + panose-1:2 11 6 4 3 5 4 4 2 4;} +@font-face + {font-family:"Century Gothic"; + panose-1:2 11 5 2 2 2 2 2 2 4;} +/* Style Definitions */ +p.MsoNormal, li.MsoNormal, div.MsoNormal + {margin:0cm; + margin-bottom:.0001pt; + font-size:11.0pt; + font-family:"Calibri","sans-serif"; + mso-fareast-language:EN-US;} +a:link, span.MsoHyperlink + {mso-style-priority:99; + color:#0563C1; + text-decoration:underline;} +a:visited, span.MsoHyperlinkFollowed + {mso-style-priority:99; + color:#954F72; + text-decoration:underline;} +span.EmailStyle17 + {mso-style-type:personal; + font-family:"Calibri","sans-serif"; + color:windowtext;} +span.EmailStyle18 + {mso-style-type:personal-reply; + font-family:"Calibri","sans-serif"; + color:#1F497D;} +.MsoChpDefault + {mso-style-type:export-only; + font-size:10.0pt;} +@page WordSection1 + {size:612.0pt 792.0pt; + margin:70.85pt 70.85pt 70.85pt 70.85pt;} +div.WordSection1 + {page:WordSection1;} +--></style><!--[if gte mso 9]><xml> +<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" /> +</xml><![endif]--><!--[if gte mso 9]><xml> +<o:shapelayout v:ext=3D"edit"> +<o:idmap v:ext=3D"edit" data=3D"1" /> +</o:shapelayout></xml><![endif]--> +</head> +<body lang=3D"FR" link=3D"#0563C1" vlink=3D"#954F72"> +<div class=3D"WordSection1"> +<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p> </o:p></spa= +n></p> +<p class=3D"MsoNormal"><span style=3D"color:#1F497D"><o:p> </o:p></spa= +n></p> +<div> +<div style=3D"border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm = +0cm 0cm"> +<p class=3D"MsoNormal"><b><span style=3D"font-size:10.0pt;font-family:"= +;Tahoma","sans-serif";mso-fareast-language:FR">De :</sp= +an></b><span style=3D"font-size:10.0pt;font-family:"Tahoma","= +;sans-serif";mso-fareast-language:FR"> Prevost, Fanny [mailto:fanny.pr= +evost@castorama.fr] +<br> +<b>Envoy=E9 :</b> mercredi 23 mai 2018 09:35<br> +<b>=C0 :</b> serviceclients<br> +<b>Cc :</b> Bodin, Christophe; Minerba, ALBAN<br> +<b>Objet :</b> Interrogation technique<o:p></o:p></span></p> +</div> +</div> +<p class=3D"MsoNormal"><o:p> </o:p></p> +<p class=3D"MsoNormal">Bonjour, <br> +<br> +Je me permet de vous contacter car j’ai mon client, M SUIRE Nicolas q= +ui =E0 commander en septembre des volets battant.<o:p></o:p></p> +<p class=3D"MsoNormal">Cependant, au moment de les poser il s’est ape= +r=E7u que les pentures livr=E9es avec ses volets =E9taient diff=E9rentes du= + fait de la largeur des volets.<o:p></o:p></p> +<p class=3D"MsoNormal"><br> +Mon client =E0 des volets de dimension 1200 mm et 1195 mm et pour 5 millim= +=E8tres en moins les pentures sont nettement plus petites ce qui g=EAne for= +tement le rendu final.<br> +De ce fait, nous aimerions vous commander des pentures au bonnes dimensions= + soit les m=EAmes que celles avec un volet d’une largeur de 1200 mm.<= +br> +Pouvez-vous m’indiquer ce que je dois mettre dans mon bon de commande= + pour nous nous comprenions dans le but d’avoir rapidement les pentur= +es ?<o:p></o:p></p> +<p class=3D"MsoNormal"><br> +Vous trouverez ci-joint le bon de commande initial.<br> +<br> +Dans l’attente de votre r=E9ponse,<br> +<br> +Bien cordialement,<o:p></o:p></p> +<p class=3D"MsoNormal"><o:p> </o:p></p> +<table class=3D"MsoNormalTable" border=3D"0" cellspacing=3D"0" cellpadding= +=3D"0" align=3D"left" width=3D"720" style=3D"width:540.0pt;border-collapse:= +collapse"> +<tbody> +<tr> +<td width=3D"119" valign=3D"top" style=3D"width:89.3pt;padding:0cm 0cm 0cm = +0cm"> +<p class=3D"MsoNormal" style=3D"line-height:115%;mso-element:frame;mso-elem= +ent-frame-hspace:2.25pt;mso-element-wrap:around;mso-element-anchor-vertical= +:paragraph;mso-element-anchor-horizontal:column;mso-height-rule:exactly"> +<span style=3D"font-family:"Century Gothic","sans-serif"= +;;mso-fareast-language:FR"><o:p></o:p></span></p> +</td> +<td width=3D"601" style=3D"width:450.7pt;padding:0cm 0cm 0cm 0cm"> +<p class=3D"MsoNormal" style=3D"line-height:14.0pt;mso-element:frame;mso-el= +ement-frame-hspace:2.25pt;mso-element-wrap:around;mso-element-anchor-vertic= +al:paragraph;mso-element-anchor-horizontal:column;mso-height-rule:exactly"> +<b><span style=3D"font-family:"Century Gothic","sans-serif&q= +uot;;color:#58585A;mso-fareast-language:FR">Prevost Fanny<o:p></o:p></span>= +</b></p> +<p class=3D"MsoNormal" style=3D"line-height:11.0pt;mso-element:frame;mso-el= +ement-frame-hspace:2.25pt;mso-element-wrap:around;mso-element-anchor-vertic= +al:paragraph;mso-element-anchor-horizontal:column;mso-height-rule:exactly"> +<span style=3D"font-size:10.0pt;font-family:"Century Gothic",&quo= +t;sans-serif";color:#58585A;mso-fareast-language:FR">Chef de Rayon Men= +uiserie ext=E9rieure +<br> +</span><span style=3D"font-size:9.0pt;font-family:"Century Gothic"= +;,"sans-serif";color:#58585A;mso-fareast-language:FR">ZAC des Sab= +lons<o:p></o:p></span></p> +<p class=3D"MsoNormal" style=3D"line-height:11.0pt;mso-element:frame;mso-el= +ement-frame-hspace:2.25pt;mso-element-wrap:around;mso-element-anchor-vertic= +al:paragraph;mso-element-anchor-horizontal:column;mso-height-rule:exactly"> +<span style=3D"font-size:9.0pt;font-family:"Century Gothic","= +;sans-serif";color:#58585A;mso-fareast-language:FR">77410 Claye Souill= +y</span><span style=3D"mso-fareast-language:FR"><o:p></o:p></span></p> +<p class=3D"MsoNormal" style=3D"line-height:11.0pt;mso-element:frame;mso-el= +ement-frame-hspace:2.25pt;mso-element-wrap:around;mso-element-anchor-vertic= +al:paragraph;mso-element-anchor-horizontal:column;mso-height-rule:exactly"> +<span style=3D"font-size:9.0pt;font-family:"Century Gothic","= +;sans-serif";color:#58585A;mso-fareast-language:FR">T=E9l : += +33 (0)1 60 94 82 66</span><b><span style=3D"font-size:8.0pt;font-family:&qu= +ot;Century Gothic","sans-serif";color:#58585A;mso-fareast-la= +nguage:FR"> +<o:p></o:p></span></b></p> +</td> +</tr> +</tbody> +</table> +<p class=3D"MsoNormal"><span style=3D"mso-fareast-language:FR"><o:p> <= +/o:p></span></p> +<p class=3D"MsoNormal"><o:p> </o:p></p> +</div> +</body> +</html> + +--_000_E7C76F0CE76FA14287E830E5381C0582F3309398S8EXCP01macgrou_-- -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.