Build #395

Plan branch:

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • Ivo Ulrich <teleivo@users.noreply.github.com>

    Ivo Ulrich <teleivo@users.noreply.github.com> c271bb4e417f53113def69a983d871bf955dfbe4

    Merge pull request #479 from teleivo/stream
    Use String instead of InputStream on importing templates

  • teleivo <mrteleivo@gmail.com>

    teleivo <mrteleivo@gmail.com> 2fa23f14dfc74758d3201903b8f0b97c3263dd7e

    Use String instead of InputStream on importing templates
    Replace parameter type from InputStream to String in
    interfaces for MrrtReportTemplateService.importMrrtReportTemplate
    MrrtReportTemplateValidator.validate and MrrtReportTemplateFileParser.parse
    since template files are expected to be < 120kB and this greatly
    simplifies handling as InputStreams can only be read once.

    * change import, parse, validate iface to String instead of InputStream
    * simplify tests by extracting repetivite things (getFile,
    getFileContent) for test mrrt template files into helper methods
    * improve RadiologyDashboardReportTemplatesTabControllerTest verify
    service calls and use springs MockMultipartFile
    * improve javadoc im MrrtReportTemplateService and tests
    * merge tests of MrrtReportTemplateService.importMrrtReportTemplate
    ensuring creation in db and filesystem into one test
    * make sure that the InputStream's we open are closed via
    try-with-resource syntax
    * use apache commons FileUtils.writeStringToFile to write template to
    file instead of OpenmrsUtils

    • api/src/main/java/org/openmrs/module/radiology/report/template/DefaultMrrtReportTemplateFileParser.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateFileParser.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateService.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateServiceImpl.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/main/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateValidator.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/main/java/org/openmrs/module/radiology/report/template/XsdMrrtReportTemplateValidator.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/test/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateFileParserComponentTest.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/test/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateServiceComponentTest.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • api/src/test/java/org/openmrs/module/radiology/report/template/MrrtReportTemplateValidatorTest.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • omod/src/main/java/org/openmrs/module/radiology/report/template/web/RadiologyDashboardReportTemplatesTabController.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)
    • omod/src/test/java/org/openmrs/module/radiology/report/template/web/RadiologyDashboardReportTemplatesTabControllerTest.java (version 2fa23f14dfc74758d3201903b8f0b97c3263dd7e)