Any text string can be converted to UTF-8 bytes ({@code - * s.getBytes(StandardCharsets.UTF_8)}) and encoded as a byte mode segment.
- * @param data the binary data (not {@code null}) - * @return a segment (not {@code null}) containing the data - * @throws NullPointerException if the array is {@code null} - */ - public QrSegment excute(String text) { - byte[] data = text.getBytes(StandardCharsets.UTF_8)); - - Objects.requireNonNull(data); - BitBuffer bitBuffer = new BitBuffer(); - for (byte bits : data) - changeByteToSegment(bitBuffer, bits); - return new QrSegment(QrSegment.Mode.BYTE, data.length, bitBuffer); - } - - public QrSegment excuteForBytedata(byte[] data) { - Objects.requireNonNull(data); - BitBuffer bitBuffer = new BitBuffer(); - for (byte bits : data) - changeByteToSegment(bitBuffer, bits); - return new QrSegment(QrSegment.Mode.BYTE, data.length, bitBuffer); - } - - public static void changeByteToSegment(BitBuffer bitBuffer, byte bits) { - bitBuffer.appendBits(bits & 0xFF, 8); - } -} +import java.nio.charset.StandardCharsets; +import java.util.Objects; + +public class MakeBytesToSegment implements MakeSegment { + + /** + * Returns a segment representing the specified binary data + * encoded in byte mode. All input byte arrays are acceptable. + *Any text string can be converted to UTF-8 bytes ({@code + * s.getBytes(StandardCharsets.UTF_8)}) and encoded as a byte mode segment.
+ * @param data the binary data (not {@code null}) + * @return a segment (not {@code null}) containing the data + * @throws NullPointerException if the array is {@code null} + */ + public QrSegment excute(String text) { + byte[] data = text.getBytes(StandardCharsets.UTF_8)); + + Objects.requireNonNull(data); + BitBuffer bitBuffer = new BitBuffer(); + for (byte bits : data) + changeByteToSegment(bitBuffer, bits); + return new QrSegment(QrSegment.Mode.BYTE, data.length, bitBuffer); + } + + public QrSegment excuteForBytedata(byte[] data) { + Objects.requireNonNull(data); + BitBuffer bitBuffer = new BitBuffer(); + for (byte bits : data) + changeByteToSegment(bitBuffer, bits); + return new QrSegment(QrSegment.Mode.BYTE, data.length, bitBuffer); + } + + public static void changeByteToSegment(BitBuffer bitBuffer, byte bits) { + bitBuffer.appendBits(bits & 0xFF, 8); + } +} + diff --git a/java/src/main/java/io/nayuki/qrcodegen/MakeNumericToSegment.java b/java/src/main/java/io/nayuki/qrcodegen/MakeNumericToSegment.java index 3da7b7e..56f88b5 100644 --- a/java/src/main/java/io/nayuki/qrcodegen/MakeNumericToSegment.java +++ b/java/src/main/java/io/nayuki/qrcodegen/MakeNumericToSegment.java @@ -1,33 +1,33 @@ -import java.util.Objects; - -public class MakeNumericToSegment implements MakeSegment { - - /** - * Returns a segment representing the specified string of decimal digits encoded in numeric mode. - * @param digits the text (not {@code null}), with only digits from 0 to 9 allowed - * @return a segment (not {@code null}) containing the text - * @throws NullPointerException if the string is {@code null} - * @throws IllegalArgumentException if the string contains non-digit characters - */ - public QrSegment excute(String digits) { - Objects.requireNonNull(digits); - if (containNonNumericCharaters(digits)) - throw new IllegalArgumentException("String contains non-numeric characters"); - - BitBuffer bitBuffer = new BitBuffer(); - changeNumericToSegment(digits, bitBuffer); - return new QrSegment(QrSegment.Mode.NUMERIC, digits.length(), bitBuffer); - } - - public static void changeNumericToSegment(String digits, BitBuffer bitBuffer) { - for (int i = 0; i < digits.length(); ) { // Consume up to 3 digits per iteration - int n = Math.min(digits.length() - i, 3); - bitBuffer.appendBits(Integer.parseInt(digits.substring(i, i + n)), n * 3 + 1); - i += n; - } - } - - public static boolean containNonNumericCharaters(String digits) { - return !QrSegment.NUMERIC_REGEX.matcher(digits).matches(); - } -} +import java.util.Objects; + +public class MakeNumericToSegment implements MakeSegment { + + /** + * Returns a segment representing the specified string of decimal digits encoded in numeric mode. + * @param digits the text (not {@code null}), with only digits from 0 to 9 allowed + * @return a segment (not {@code null}) containing the text + * @throws NullPointerException if the string is {@code null} + * @throws IllegalArgumentException if the string contains non-digit characters + */ + public QrSegment excute(String digits) { + Objects.requireNonNull(digits); + if (containNonNumericCharaters(digits)) + throw new IllegalArgumentException("String contains non-numeric characters"); + + BitBuffer bitBuffer = new BitBuffer(); + changeNumericToSegment(digits, bitBuffer); + return new QrSegment(QrSegment.Mode.NUMERIC, digits.length(), bitBuffer); + } + + public static void changeNumericToSegment(String digits, BitBuffer bitBuffer) { + for (int i = 0; i < digits.length(); ) { // Consume up to 3 digits per iteration + int n = Math.min(digits.length() - i, 3); + bitBuffer.appendBits(Integer.parseInt(digits.substring(i, i + n)), n * 3 + 1); + i += n; + } + } + + public static boolean containNonNumericCharaters(String digits) { + return !QrSegment.NUMERIC_REGEX.matcher(digits).matches(); + } +} \ No newline at end of file diff --git a/java/src/main/java/io/nayuki/qrcodegen/MakeSegment.java b/java/src/main/java/io/nayuki/qrcodegen/MakeSegment.java index ccca2ba..8a21ad3 100644 --- a/java/src/main/java/io/nayuki/qrcodegen/MakeSegment.java +++ b/java/src/main/java/io/nayuki/qrcodegen/MakeSegment.java @@ -1,4 +1,4 @@ - -public interface MakeSegment { - public QrSegment excute(String text); -} + +public interface MakeSegment { + public QrSegment excute(String text); +} \ No newline at end of file diff --git a/java/src/main/java/io/nayuki/qrcodegen/MakeSegmentFactory.java b/java/src/main/java/io/nayuki/qrcodegen/MakeSegmentFactory.java index b21a516..78b648e 100644 --- a/java/src/main/java/io/nayuki/qrcodegen/MakeSegmentFactory.java +++ b/java/src/main/java/io/nayuki/qrcodegen/MakeSegmentFactory.java @@ -1,15 +1,15 @@ -public class MakeSegmentFactory { - public static MakeSegment getMakeSegment(String text) { - MakeSegment makeSegment = null; - - if (text.equals("")); // Leave result empty - else if (QrSegment.NUMERIC_REGEX.matcher(text).matches()) - makeSegment = new MakeNumericToSegment(); - else if (QrSegment.ALPHANUMERIC_REGEX.matcher(text).matches()) - makeSegment = new MakeAlphaNumericToSegment(); - else - makeSegment = new MakeBytesToSegment(); - - return makeSegment; - } -} +public class MakeSegmentFactory { + public static MakeSegment getMakeSegment(String text) { + MakeSegment makeSegment = null; + + if (text.equals("")); // Leave result empty + else if (QrSegment.NUMERIC_REGEX.matcher(text).matches()) + makeSegment = new MakeNumericToSegment(); + else if (QrSegment.ALPHANUMERIC_REGEX.matcher(text).matches()) + makeSegment = new MakeAlphaNumericToSegment(); + else + makeSegment = new MakeBytesToSegment(); + + return makeSegment; + } +} \ No newline at end of file diff --git a/java/src/main/java/io/nayuki/qrcodegen/QrCode.java b/java/src/main/java/io/nayuki/qrcodegen/QrCode.java index 5ade16c..d486986 100644 --- a/java/src/main/java/io/nayuki/qrcodegen/QrCode.java +++ b/java/src/main/java/io/nayuki/qrcodegen/QrCode.java @@ -190,7 +190,7 @@ public final class QrCode { BitBuffer bitBuffer = new BitBuffer(); for (QrSegment segment : segments) { bitBuffer.appendBits(segment.mode.modeBits, 4); - bitBuffer.appendBits(segment.numChars, segment.mode.numCharCountBits(version)); + bitBuffer.appendBits(segment.numberOfCharacters, segment.mode.numCharCountBits(version)); bitBuffer.appendData(segment.data); } return bitBuffer; @@ -258,7 +258,13 @@ public final class QrCode { // Indicates function modules that are not subjected to masking. Discarded when constructor finishes. private boolean[][] isFunction; + public void setModules(int size) { + this.modules = new boolean [size][size]; + } + public void setIsFunction(int size) { + this.isFunction = new boolean [size][size]; + } /*---- Constructor (low level) ----*/ @@ -581,9 +587,7 @@ public final class QrCode { // the same mask value a second time will undo the mask. A final well-formed // QR Code needs exactly one (not zero, two, etc.) mask applied. - private void applyMask(int msk) { - - + public void applyMask(int msk) { if (msk < 0 || msk > 7) throw new IllegalArgumentException("Mask value out of range"); for (int y = 0; y < size; y++) { @@ -593,7 +597,7 @@ public final class QrCode { Command mskCommand = MskCommandFactory.getCommand(msk); Button button = new Button(mskCommand); invert = button.pressed(y, x, msk); - + modules[y][x] ^= invert & !isFunction[y][x]; } } @@ -612,7 +616,10 @@ public final class QrCode { drawFormatBits(mask); // Overwrite old format bits return mask; // The caller shall assign this value to the final-declared field } - + + public int executeHandleConstructorMasking(int mask) { + return handleConstructorMasking(mask); + } // Automatically choose best mask private int findBestMask() { @@ -749,7 +756,11 @@ public final class QrCode { assert 208 <= result && result <= 29648; return result; } - + + public int excuteGetNumRawDataModules(int ver) { + return getNumRawDataModules(ver); + } + private static int calculateNumOfModules(int ver) { int size = ver * 4 + 17; int result = size * size; // Number of modules in the whole QR Code square @@ -794,7 +805,9 @@ public final class QrCode { return result; } - + public byte[] executeReedSolomonComputeDivisor(int degree) { + return reedSolomonComputeDivisor(degree); + } // Returns the Reed-Solomon error correction codeword for the given data and divisor polynomials. private static byte[] reedSolomonComputeRemainder(byte[] data, byte[] divisor) { Objects.requireNonNull(data); diff --git a/java/src/main/java/io/nayuki/qrcodegen/QrCodeTest.java b/java/src/main/java/io/nayuki/qrcodegen/QrCodeTest.java new file mode 100644 index 0000000..db40c4b --- /dev/null +++ b/java/src/main/java/io/nayuki/qrcodegen/QrCodeTest.java @@ -0,0 +1,165 @@ +package io.nayuki.qrcodegen; + +import static org.junit.Assert.*; +import org.junit.*; + +public class QrCodeTest { + + @Test + public void testFactory() { + Command mskCommand0 = MskCommandFactory.getCommand(0); + Button button0 = new Button(mskCommand0); + assertEquals(true, button0.pressed(0, 2, 1)); + + Command mskCommand1 = MskCommandFactory.getCommand(1); + Button button1 = new Button(mskCommand1); + assertEquals(true, button1.pressed(0, 2, 1)); + + Command mskCommand2 = MskCommandFactory.getCommand(2); + Button button2 = new Button(mskCommand2); + assertEquals(true, button2.pressed(0, 3, 1)); + + Command mskCommand3 = MskCommandFactory.getCommand(3); + Button button3 = new Button(mskCommand3); + assertEquals(true, button3.pressed(1, 2, 1)); + + Command mskCommand4 = MskCommandFactory.getCommand(4); + Button button4 = new Button(mskCommand4); + assertEquals(true, button4.pressed(0, 2, 1)); + + Command mskCommand5 = MskCommandFactory.getCommand(5); + Button button5 = new Button(mskCommand5); + assertEquals(true, button5.pressed(0, 2, 1)); + + Command mskCommand6 = MskCommandFactory.getCommand(6); + Button button6 = new Button(mskCommand6); + assertEquals(true, button6.pressed(0, 2, 1)); + + Command mskCommand7 = MskCommandFactory.getCommand(7); + Button button7 = new Button(mskCommand7); + assertEquals(true, button7.pressed(0, 4, 1)); + } + + @Test(expected = AssertionError.class) + public void testAssertionError() { + + Command mskCommand = MskCommandFactory.getCommand(9); + + } + + @Test + public void testApplyMask() { + Ecc errCorLvl = Ecc.LOW; + Ecc errCorLv2 = Ecc.MEDIUM; + Ecc errCorLv3 = Ecc.QUARTILE; + Ecc errCorLv4 = Ecc.HIGH; + + int version1 = 1; + int version2 = 2; + int version3 = 39; + int version4 = 40; + + int size1 = version1 * 4 + 17; + int size2 = version2 * 4 + 17; + int size3 = version3 * 4 + 17; + int size4 = version4 * 4 + 17; + + String text = "Hello, world!"; + + QrCode qrcodeLOW = QrCode.encodeText(text, errCorLvl); + QrCode qrcodeMEDIUM = QrCode.encodeText(text, errCorLv2); + QrCode qrcodeQUARTILE = QrCode.encodeText(text, errCorLv3); + QrCode qrcodeHIGH = QrCode.encodeText(text, errCorLv4); + + qrcodeLOW.excuteGetNumRawDataModules(version1); + qrcodeMEDIUM.excuteGetNumRawDataModules(version2); + qrcodeQUARTILE.excuteGetNumRawDataModules(version3); + qrcodeHIGH.excuteGetNumRawDataModules(version4); + + qrcodeLOW.executeReedSolomonComputeDivisor(1); + qrcodeMEDIUM.executeReedSolomonComputeDivisor(2); + qrcodeQUARTILE.executeReedSolomonComputeDivisor(254); + qrcodeHIGH.executeReedSolomonComputeDivisor(255); + + qrcodeLOW.setModules(size1); + qrcodeLOW.setIsFunction(size1); + qrcodeMEDIUM.setModules(size2); + qrcodeMEDIUM.setIsFunction(size2); + qrcodeQUARTILE.setModules(size3); + qrcodeQUARTILE.setIsFunction(size3); + qrcodeHIGH.setModules(size4); + qrcodeHIGH.setIsFunction(size4); + + qrcodeLOW.applyMask(0); + qrcodeMEDIUM.applyMask(1); + qrcodeQUARTILE.applyMask(6); + qrcodeHIGH.applyMask(7); + + } + + @Test(expected = IllegalArgumentException.class) + public void testIllegalArgumentException_applyMask_MAXBound() { + + Ecc errCorLvl = Ecc.LOW; + String text = "Hello, world!"; + + QrCode qrcodeLOW = QrCode.encodeText(text, errCorLvl); + qrcodeLOW.applyMask(8); + + } + + @Test(expected = IllegalArgumentException.class) + public void testIllegalArgumentException_applyMask_MINBouond() { + + Ecc errCorLvl = Ecc.LOW; + String text = "Hello, world!"; + + QrCode qrcodeLOW = QrCode.encodeText(text, errCorLvl); + qrcodeLOW.applyMask(-1); + + } + + @Test(expected = IllegalArgumentException.class) + public void testIllegalArgumentException_getNumRawDataModules_MINBound() { + + Ecc errCorLvl = Ecc.LOW; + String text = "Hello, world!"; + + QrCode qrcodeLOW = QrCode.encodeText(text, errCorLvl); + qrcodeLOW.excuteGetNumRawDataModules(0); + + } + + @Test(expected = IllegalArgumentException.class) + public void testIllegalArgumentException_getNumRawDataModules_MAXBound() { + + Ecc errCorLvl = Ecc.LOW; + String text = "Hello, world!"; + + QrCode qrcodeLOW = QrCode.encodeText(text, errCorLvl); + qrcodeLOW.excuteGetNumRawDataModules(41); + + } + + @Test(expected = IllegalArgumentException.class) + public void testIllegalArgumentException_ReedSolomonComputeDivisor_MINBound() { + + Ecc errCorLvl = Ecc.LOW; + String text = "Hello, world!"; + + QrCode qrcodeLOW = QrCode.encodeText(text, errCorLvl); + qrcodeLOW.executeReedSolomonComputeDivisor(0); + + } + + @Test(expected = IllegalArgumentException.class) + public void testIllegalArgumentException_ReedSolomonComputeDivisor_MAXBound() { + + Ecc errCorLvl = Ecc.LOW; + String text = "Hello, world!"; + + QrCode qrcodeLOW = QrCode.encodeText(text, errCorLvl); + qrcodeLOW.executeReedSolomonComputeDivisor(256); + + } +} \ No newline at end of file diff --git a/java/src/main/java/io/nayuki/qrcodegen/QrMode.java b/java/src/main/java/io/nayuki/qrcodegen/QrMode.java index f5636b3..3f0127f 100644 --- a/java/src/main/java/io/nayuki/qrcodegen/QrMode.java +++ b/java/src/main/java/io/nayuki/qrcodegen/QrMode.java @@ -7,7 +7,7 @@ public abstract class QrMode { int modeBits; // Number of character count bits for three different version ranges. - protected int[] numBitsCharCount = new int[4]; + protected int[] numBitsCharCount; int headCost; /*-- Method --*/ diff --git a/java/src/main/java/io/nayuki/qrcodegen/QrSegment.java b/java/src/main/java/io/nayuki/qrcodegen/QrSegment.java index 307f549..019cc1a 100644 --- a/java/src/main/java/io/nayuki/qrcodegen/QrSegment.java +++ b/java/src/main/java/io/nayuki/qrcodegen/QrSegment.java @@ -32,6 +32,7 @@ import java.util.regex.Pattern; import QrSegment.Mode; + /** * A segment of character/binary/control data in a QR Code symbol. * Instances of this class are immutable. @@ -145,7 +146,7 @@ public final class QrSegment { /** The length of this segment's unencoded data. Measured in characters for * numeric/alphanumeric/kanji mode, bytes for byte mode, and 0 for ECI mode. * Always zero or positive. Not the same as the data's bit length. */ - public final int numChars; + public final int numberOfCharacters; // The data bits of this segment. Not null. Accessed through getData(). final BitBuffer data;