Force DataMatrix to square by default.

Author: MClarkDev

config/types/UPC_A.json

@@ -20,8 +20,8 @@
 	"nonprinting": false,
 	"example": "123456789012",
 	"pattern": {
-		"auto": "^(?=.*0)[0-9]{12}$",
-		"extended": "^(?=.*0)[0-9]{11,12}$"
+		"auto": "^[0-9]{12}$",
+		"extended": "^[0-9]{11,12}$"
 	},
 	"description": {
 		"en": "A universally recognized 12 digit barcode. Encodes manufacturer, product / variant, and store use codes."

src/main/java/org/barcodeapi/server/gen/impl/DefaultBarcodeProvider.java

@@ -18,6 +18,11 @@ public DefaultBarcodeProvider(CodeType codeType, AbstractBarcodeBean bean) {
 		this.generator = bean;
 	}
 
+	protected AbstractBarcodeBean getBean() {
+
+		return this.generator;
+	}
+
 	@Override
 	public byte[] onRender(BarcodeRequest request) throws Exception {
 

src/main/java/org/barcodeapi/server/gen/types/DataMatrixGenerator.java

@@ -3,6 +3,7 @@
 import org.barcodeapi.server.core.CodeType;
 import org.barcodeapi.server.gen.impl.DefaultBarcodeProvider;
 import org.krysalis.barcode4j.impl.datamatrix.DataMatrixBean;
+import org.krysalis.barcode4j.impl.datamatrix.SymbolShapeHint;
 
 /**
  * DataMatrixGenerator.java
@@ -12,8 +13,12 @@
 public class DataMatrixGenerator extends DefaultBarcodeProvider {
 
 	public DataMatrixGenerator(CodeType codeType) {
+		super(codeType, initBean());
+	}
 
-		// Setup DataMatrix generator
-		super(codeType, new DataMatrixBean());
+	private static DataMatrixBean initBean() {
+		DataMatrixBean bean = new DataMatrixBean();
+		bean.setShape(SymbolShapeHint.FORCE_SQUARE);
+		return bean;
 	}
 }