Skip to content

Shorter use of db connection for pull slips #1012

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

Open
skomorokh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Shorter use of db connection for pull slips #1012

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
4200b09
Shorter use of db connection for reports
skomorokh Aug 9, 2025
9e78fb3
Outputstream needs to be closed either way.
skomorokh Aug 11, 2025
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
3 changes: 3 additions & 0 deletions service/grails-app/controllers/mod/rs/ReportController.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.k_int.okapi.OkapiTenantAwareController;

import grails.converters.JSON;
import grails.gorm.multitenancy.CurrentTenant;
import grails.gorm.transactions.NotTransactional;
import groovy.util.logging.Slf4j;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
Expand Down Expand Up @@ -171,6 +172,7 @@ class ReportController extends OkapiTenantAwareController<Report> {
dataType = "string"
)
])
@NotTransactional
def generatePicklist() {
ContextLogging.startTime();
ContextLogging.setValue(ContextLogging.FIELD_RESOURCE, RESOURCE_REPORT);
Expand Down Expand Up @@ -235,6 +237,7 @@ class ReportController extends OkapiTenantAwareController<Report> {
dataType = "string"
)
])
@NotTransactional
def execute() {
ContextLogging.startTime();
ContextLogging.setValue(ContextLogging.FIELD_RESOURCE, RESOURCE_REPORT);
Expand Down
24 changes: 16 additions & 8 deletions service/grails-app/services/org/olf/rs/reporting/JasperReportService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,13 @@ public class JasperReportService {
String fallbackReportResource = null
) {
InputStream result = null;
ByteArrayOutputStream outputStream = null;

// If you are having issues with fonts, take a look at
// https://community.jaspersoft.com/wiki/custom-font-font-extension
Connection connection = dataSource.getConnection();
try{
JasperPrint jasperPrint;
try {
Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put(PARAMETER_IDS, idsForReport);
parameters.put(PARAMETER_SCHEMA, schema);
Expand All @@ -110,15 +112,10 @@ public class JasperReportService {
JasperReport jasperReport = getReport(fileDefinition, fallbackReportResource);

// Execute the report
JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, connection);

// Now output the report
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
JasperExportManager.exportReportToPdfStream(jasperPrint, outputStream);
result = new ByteArrayInputStream(outputStream.toByteArray());
outputStream.close();
jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, connection);
} catch(Exception e) {
log.error("Exception thrown while generating a report", e);
return result;
} finally {
// Not forgetting to close the connection
connection.close();
Expand All @@ -129,6 +126,17 @@ public class JasperReportService {
}
}

try {
// Now output the report
outputStream = new ByteArrayOutputStream();
JasperExportManager.exportReportToPdfStream(jasperPrint, outputStream);
result = new ByteArrayInputStream(outputStream.toByteArray());
} catch(Exception e) {
log.error("Exception thrown while generating a report PDF", e);
} finally {
outputStream.close();
}

// Return the result to the caller
return(result);
}
Expand Down
Loading