Skip to content

KB images were not beeing printed in PDF Reports using Sprin Boot #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iroqueta merged 2 commits into from
Sep 20, 2023
Merged

KB images were not beeing printed in PDF Reports using Sprin Boot #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c981ce
KB images were not beeing printed in PDF Reports using Sprin Boot
iroqueta Sep 18, 2023
7be8261
KB images were not beeing printed in PDF Reports using Sprin Boot
iroqueta Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion common/src/main/java/com/genexus/util/GXFileInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package com.genexus.util;
import java.io.*;
import java.util.Vector;

import com.genexus.ApplicationContext;
import com.genexus.CommonUtil;
import com.genexus.common.interfaces.SpecificImplementation;
import com.genexus.db.driver.ResourceAccessControlList;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.apache.commons.io.IOCase;
import org.springframework.core.io.ClassPathResource;

import java.util.Date;

Expand Down Expand Up @@ -33,6 +36,12 @@ public String getPath(){
}
}
public boolean exists(){
if (ApplicationContext.getInstance().isSpringBootApp() && !isDirectory) {
if (!fileSource.exists() && !new ClassPathResource(fileSource.getPath()).exists())
return false;
return true;
}

if ((isDirectory && fileSource.isDirectory()) || (!isDirectory && fileSource.isFile())) {
return fileSource.exists();
}
Expand Down Expand Up @@ -130,8 +139,12 @@ public GXDirectoryCollection listDirectories(){

public InputStream getStream(){
try {
if (ApplicationContext.getInstance().isSpringBootApp()) {
return new ClassPathResource(fileSource.getPath()).getInputStream();
}

return new FileInputStream(fileSource);
} catch (FileNotFoundException ex) {
} catch (Exception ex) {
return null;
}
}
Expand Down
15 changes: 10 additions & 5 deletions java/src/main/java/com/genexus/reports/PDFReportItext2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;

import com.genexus.ApplicationContext;
import com.genexus.CommonUtil;
import com.genexus.ModelContext;
import com.genexus.platform.NativeFunctions;
Expand Down Expand Up @@ -36,6 +37,7 @@
import com.genexus.reports.fonts.PDFFont;
import com.genexus.reports.fonts.PDFFontDescriptor;
import com.genexus.reports.fonts.Type1FontMetrics;
import org.springframework.core.io.ClassPathResource;

public class PDFReportItext2 extends GXReportPDFCommons
{
Expand Down Expand Up @@ -377,13 +379,16 @@ public void GxDrawBitMap(String bitmap, int left, int top, int right, int bottom
}
// Si la ruta a la imagen NO es absoluta, en aplicaciones Web le agregamos al comienzo la ruta al root de la aplicación
// más la staticContentBaseURL si ésta es relativa.
image = com.lowagie.text.Image.getInstance(defaultRelativePrepend + bitmap);
if(image == null) { // Si all\uFFFDEno se encuentra la imagen, entonces la buscamos bajo el webAppDir (para mantener compatibilidad)
bitmap = webAppDir + bitmap;
image = com.lowagie.text.Image.getInstance(bitmap);
bitmap = defaultRelativePrepend + bitmap;
if (ApplicationContext.getInstance().isSpringBootApp() && !new File(bitmap).exists()) {
image = com.lowagie.text.Image.getInstance(new ClassPathResource(bitmap).getContentAsByteArray());
}
else {
bitmap = defaultRelativePrepend + bitmap;
image = com.lowagie.text.Image.getInstance(bitmap);
if (image == null) { // Si all\uFFFDEno se encuentra la imagen, entonces la buscamos bajo el webAppDir (para mantener compatibilidad)
bitmap = webAppDir + bitmap;
image = com.lowagie.text.Image.getInstance(bitmap);
}
}
}
else {
Expand Down
15 changes: 10 additions & 5 deletions java/src/main/java/com/genexus/reports/PDFReportItext8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.genexus.reports;

import com.genexus.ApplicationContext;
import com.genexus.CommonUtil;
import com.genexus.ModelContext;
import com.genexus.platform.NativeFunctions;
Expand Down Expand Up @@ -41,6 +42,7 @@
import com.itextpdf.kernel.pdf.PdfDocument;
import com.itextpdf.layout.splitting.DefaultSplitCharacters;
import com.itextpdf.layout.Canvas;
import org.springframework.core.io.ClassPathResource;

import java.awt.*;
import java.io.File;
Expand Down Expand Up @@ -402,13 +404,16 @@ public void GxDrawBitMap(String bitmap, int left, int top, int right, int bottom
if (bitmap.startsWith(httpContext.getStaticContentBase())) {
bitmap = bitmap.replace(httpContext.getStaticContentBase(), "");
}
imageData = ImageDataFactory.create(defaultRelativePrepend + bitmap);
if(imageData == null) {
bitmap = webAppDir + bitmap;
imageData = ImageDataFactory.create(bitmap);
bitmap = defaultRelativePrepend + bitmap;
if (ApplicationContext.getInstance().isSpringBootApp() && !new File(bitmap).exists()) {
imageData = ImageDataFactory.create(new ClassPathResource(bitmap).getContentAsByteArray());
}
else {
bitmap = defaultRelativePrepend + bitmap;
imageData = ImageDataFactory.create(bitmap);
if (imageData == null) {
bitmap = webAppDir + bitmap;
imageData = ImageDataFactory.create(bitmap);
}
}
}
else {
Expand Down
31 changes: 20 additions & 11 deletions java/src/main/java/com/genexus/reports/PDFReportPDFBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import com.genexus.ApplicationContext;
import com.genexus.CommonUtil;
import com.genexus.ModelContext;
import com.genexus.platform.NativeFunctions;
Expand Down Expand Up @@ -40,6 +41,7 @@
import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
import org.jsoup.select.Elements;
import org.springframework.core.io.ClassPathResource;

import javax.imageio.IIOException;

Expand Down Expand Up @@ -362,13 +364,16 @@ public void GxDrawBitMap(String bitmap, int left, int top, int right, int bottom
{
bitmap = bitmap.replace(httpContext.getStaticContentBase(), "");
}
image = PDImageXObject.createFromFile(defaultRelativePrepend + bitmap,document);
if(image == null) {
bitmap = webAppDir + bitmap;
image = PDImageXObject.createFromFile(bitmap,document);
bitmap = defaultRelativePrepend + bitmap;
if (ApplicationContext.getInstance().isSpringBootApp() && !new File(bitmap).exists()) {
image = PDImageXObject.createFromByteArray(document, new ClassPathResource(bitmap).getContentAsByteArray(), bitmap);
}
else {
bitmap = defaultRelativePrepend + bitmap;
image = PDImageXObject.createFromFile(bitmap, document);
if (image == null) {
bitmap = webAppDir + bitmap;
image = PDImageXObject.createFromFile(bitmap, document);
}
}
}
else {
Expand Down Expand Up @@ -947,13 +952,17 @@ private void processHTMLElement(PDPageContentStream cb, PDRectangle htmlRectangl
if (!new File(bitmap).isAbsolute() && !bitmap.toLowerCase().startsWith("http:") && !bitmap.toLowerCase().startsWith("https:")) {
if (bitmap.startsWith(httpContext.getStaticContentBase()))
bitmap = bitmap.replace(httpContext.getStaticContentBase(), "");
image = PDImageXObject.createFromFile(defaultRelativePrepend + bitmap,document);
if(image == null) {
bitmap = webAppDir + bitmap;
image = PDImageXObject.createFromFile(bitmap,document);
bitmap = defaultRelativePrepend + bitmap;
if (ApplicationContext.getInstance().isSpringBootApp() && !new File(bitmap).exists()) {
image = PDImageXObject.createFromByteArray(document, new ClassPathResource(bitmap).getContentAsByteArray(), bitmap);
}
else {
image = PDImageXObject.createFromFile(bitmap, document);
if (image == null) {
bitmap = webAppDir + bitmap;
image = PDImageXObject.createFromFile(bitmap, document);
}
}
else
bitmap = defaultRelativePrepend + bitmap;
}
else
image = PDImageXObject.createFromFile(bitmap,document);
Expand Down