diff --git a/renderer/pom.xml b/renderer/pom.xml
index 2085e25..8acc633 100644
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -32,7 +32,7 @@
org.apache.maven.pluginsmaven-compiler-plugin3.14.1truetrue-XDcompilePolicy=simple--should-stop=ifError=FLOW-XDaddTypeAnnotationsToSymbol=true-Xplugin:ErrorProne -Xep:UnnecessaryParentheses:OFF -Xep:NotJavadoc:OFF-Xlint:all-Werrorcom.google.errorproneerror_prone_core2.49.0
- org.apache.maven.pluginsmaven-surefire-plugin3.5.4true${project.build.directory}
+ org.apache.maven.pluginsmaven-surefire-plugin3.5.4${revision}true${project.build.directory}
org.apache.maven.pluginsmaven-dependency-plugin3.9.0runtime-librariespackagecopy-dependenciesruntime${project.build.directory}/lib
org.apache.maven.pluginsmaven-jar-plugin3.4.2com.kingsrook.qbits.renderer.RendererMaintruelib/
org.apache.maven.pluginsmaven-checkstyle-plugin3.3.1com.puppycrawl.toolscheckstyle10.12.6${project.basedir}/checkstyle/config.xmlcheckstyle.reactor.root=${project.basedir}truetruewarningtruevalidatecheck
diff --git a/renderer/src/main/java/com/kingsrook/qbits/renderer/BarcodeCatalog.java b/renderer/src/main/java/com/kingsrook/qbits/renderer/BarcodeCatalog.java
index 188725e..2ab89a8 100644
--- a/renderer/src/main/java/com/kingsrook/qbits/renderer/BarcodeCatalog.java
+++ b/renderer/src/main/java/com/kingsrook/qbits/renderer/BarcodeCatalog.java
@@ -51,6 +51,15 @@ public final class BarcodeCatalog
{
private static final Map> FACTORIES = factories();
+ /*******************************************************************************
+ ** Encoders whose geometry is fixed by their specification (matrix symbols and
+ ** postal four-state codes): barHeight changes nothing for them, so it is
+ ** neither advertised nor accepted. BarcodeDeclaredCapabilityTest proves this
+ ** set is exactly the encoders on which barHeight has no effect.
+ *******************************************************************************/
+ private static final java.util.Set FIXED_GEOMETRY = java.util.Set.of("australia-post", "aztec", "aztec-rune", "code-one", "code16k",
+ "code49", "datamatrix", "grid-matrix", "japan-post", "kix", "maxicode", "micro-qr", "qr", "royal-mail", "swiss-qr", "upn-qr");
+
/*******************************************************************************
** Utility class.
@@ -142,7 +151,14 @@ public final class BarcodeCatalog
{
Symbol symbol = FACTORIES.get(id).get();
Map options = new LinkedHashMap<>();
- options.put("barHeight", Map.of("type", "integer", "minimum", 1, "maximum", 1000));
+ if("gs1-databar".equals(id))
+ {
+ options.put("barHeight", Map.of("type", "integer", "minimum", 1, "maximum", 1000, "notWithMode", "STACKED"));
+ }
+ else if(!FIXED_GEOMETRY.contains(id))
+ {
+ options.put("barHeight", Map.of("type", "integer", "minimum", 1, "maximum", 1000));
+ }
if(symbol instanceof Coop2Of5)
{
options.put("checkDigit", Map.of("type", "string", "values", List.of("NONE", "ADD", "VALIDATE"), "default", "NONE"));
@@ -380,6 +396,10 @@ public final class BarcodeCatalog
}
Symbol symbol = factory.get();
structuredAppend(type, symbol, options);
+ if(options.has("barHeight") && (FIXED_GEOMETRY.contains(type) || ("gs1-databar".equals(type) && options.has("mode") && "STACKED".equals(options.get("mode").asText()))))
+ {
+ throw new IllegalArgumentException("UNSUPPORTED_BARCODE_OPTION");
+ }
for(Map.Entry field : options.properties())
{
if(List.of("qr", "datamatrix", "aztec").contains(type) && field.getKey().startsWith("structuredAppend"))
diff --git a/renderer/src/main/java/com/kingsrook/qbits/renderer/PdfRenderer.java b/renderer/src/main/java/com/kingsrook/qbits/renderer/PdfRenderer.java
index 98a3f48..5171a47 100644
--- a/renderer/src/main/java/com/kingsrook/qbits/renderer/PdfRenderer.java
+++ b/renderer/src/main/java/com/kingsrook/qbits/renderer/PdfRenderer.java
@@ -96,6 +96,36 @@ public final class PdfRenderer
public static void validate(RenderInput input) throws Exception
{
template(input.source);
+ for(Element element : Jsoup.parse(input.source).select("qqq-barcode"))
+ {
+ refuseUnsupportedOptions(element.attr("type"), element.attr("options"));
+ }
+ }
+
+
+ /*******************************************************************************
+ ** Literal barcode options are checked against the catalog before any data
+ ** exists, so an option the encoder cannot honour is refused at validation as
+ ** its own closed code. Templated type or options are checked when rendered,
+ ** and any other problem is left for the render to report.
+ *******************************************************************************/
+ private static void refuseUnsupportedOptions(String type, String options)
+ {
+ if(options.isBlank() || type.contains("${") || type.contains("<#") || options.contains("${") || options.contains("<#"))
+ {
+ return;
+ }
+ try
+ {
+ BarcodeCatalog.create(type, Wire.JSON.readTree(options));
+ }
+ catch(Exception exception)
+ {
+ if(exception instanceof IllegalArgumentException refusal && "UNSUPPORTED_BARCODE_OPTION".equals(refusal.getMessage()))
+ {
+ throw refusal;
+ }
+ }
}
diff --git a/renderer/src/main/java/com/kingsrook/qbits/renderer/RendererMain.java b/renderer/src/main/java/com/kingsrook/qbits/renderer/RendererMain.java
index 217ee8f..0cd1c57 100644
--- a/renderer/src/main/java/com/kingsrook/qbits/renderer/RendererMain.java
+++ b/renderer/src/main/java/com/kingsrook/qbits/renderer/RendererMain.java
@@ -103,7 +103,8 @@ public final class RendererMain
"BARCODE_FIT_TOO_SMALL", "BARCODE_FIT_UNSUPPORTED", "BARCODE_FIT_BOX_OUTSIDE_STOCK",
"BARCODE_FIT_GEOMETRY_MISMATCH", "INVALID_BARCODE_FIT_PROFILE", "INVALID_BARCODE_FIT_REQUEST",
"BARCODE_SYMBOLOGY_NOT_ALLOWED", "SYMBOLOGY_ALLOWLIST_REQUIRED", "SCANNER_BARCODE_PROFILE_UNSUPPORTED",
- "SCANNER_BARCODE_PAYLOAD_UNSUPPORTED", "SCANNER_BARCODE_CHECKSUM_REQUIRED", "SCANNER_BARCODE_CHECKSUM_MISMATCH").contains(message))
+ "SCANNER_BARCODE_PAYLOAD_UNSUPPORTED", "SCANNER_BARCODE_CHECKSUM_REQUIRED", "SCANNER_BARCODE_CHECKSUM_MISMATCH",
+ "UNSUPPORTED_BARCODE_OPTION").contains(message))
{
return (message);
}
diff --git a/renderer/src/test/java/com/kingsrook/qbits/renderer/BackgroundImageQualification.java b/renderer/src/test/java/com/kingsrook/qbits/renderer/BackgroundImageQualification.java
index 616e2da..2295f53 100644
--- a/renderer/src/test/java/com/kingsrook/qbits/renderer/BackgroundImageQualification.java
+++ b/renderer/src/test/java/com/kingsrook/qbits/renderer/BackgroundImageQualification.java
@@ -84,16 +84,32 @@ public final class BackgroundImageQualification
cases += 2;
}
return (Map.of("cases", cases, "surfaces", List.of("element", "pseudo", "page"), "exactRgbAlphaAndDimensions", true,
- "bothAliasPaintOrders", true, "provider", "com.kingsrook.thirdparty:openhtmltopdf-pdfbox:1.1.105-qqq-p1",
+ "bothAliasPaintOrders", true, "provider", "com.kingsrook.thirdparty:openhtmltopdf-pdfbox:" + providerVersion(),
"qualification", "trusted-product-fixtures-only"));
}
+ /***************************************************************************
+ ** The patched OpenHTML provider is published at the family version of this
+ ** reactor, which surefire passes in; there is no second literal to keep in sync.
+ ***************************************************************************/
+ private static String providerVersion()
+ {
+ String version = System.getProperty("kof22.provider.version");
+ if(version == null || version.isBlank())
+ {
+ throw new IllegalArgumentException("PDF_PROVIDER_VERSION_PROPERTY_MISSING");
+ }
+ return (version);
+ }
+
+
+
/***************************************************************************
** One provider class must come from the private patched GAV, with unchanged official companion versions.
***************************************************************************/
static void verifyProvider() throws Exception
{
- verifyArtifact(com.openhtmltopdf.pdfboxout.PdfBoxFastOutputDevice.class, "com.kingsrook.thirdparty", "openhtmltopdf-pdfbox", "1.1.105-qqq-p1");
+ verifyArtifact(com.openhtmltopdf.pdfboxout.PdfBoxFastOutputDevice.class, "com.kingsrook.thirdparty", "openhtmltopdf-pdfbox", providerVersion());
verifyArtifact(com.openhtmltopdf.css.parser.CSSParser.class, "io.github.openhtmltopdf", "openhtmltopdf-core", "1.1.105");
verifyArtifact(org.apache.pdfbox.pdmodel.PDDocument.class, "org.apache.pdfbox", "pdfbox", "3.0.8");
}