Skip to content

Commit b633bc1

Browse files
rbygraverbygrave
authored
Remove uncommented code from NumberParser (#224)
- Modify @generated to be @generated("io.avaje.jsonb.generator")
1 parent d30f827 commit b633bc1

File tree

4 files changed

+8
-192
lines changed

4 files changed

+8
-192
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[![Build](https://github.com/avaje/avaje-jsonb/actions/workflows/build.yml/badge.svg)](https://github.com/avaje/avaje-jsonb/actions/workflows/build.yml)
22
[![Maven Central](https://img.shields.io/maven-central/v/io.avaje/avaje-jsonb.svg?label=Maven%20Central)](https://mvnrepository.com/artifact/io.avaje/avaje-jsonb)
3+
[![javadoc](https://javadoc.io/badge2/io.avaje/avaje-jsonb/javadoc.svg?&color=purple)](https://javadoc.io/doc/io.avaje/avaje-jsonb)
34
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/avaje/avaje-jsonb/blob/master/LICENSE)
45
[![Discord](https://img.shields.io/discord/1074074312421683250?color=%237289da&label=discord)](https://discord.gg/Qcqf9R27BR)
56

‎jsonb-generator/src/main/java/io/avaje/jsonb/generator/SimpleAdapterWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ private void writeClassStart() {
111111
if (genericParamsCount > 0) {
112112
writer.append("@SuppressWarnings({\"unchecked\", \"rawtypes\"})").eol();
113113
}
114-
writer.append("@Generated").eol();
115-
writer.append("public final class %sJsonAdapter implements JsonAdapter<%s> ", adapterShortName, beanReader.shortName());
114+
writer.append("@Generated(\"io.avaje.jsonb.generator\")").eol();
115+
writer.append("public final class %sJsonAdapter implements JsonAdapter<%s>", adapterShortName, beanReader.shortName());
116116
if (beanReader.supportsViewBuilder()) {
117117
writer.append(", ViewBuilderAware ");
118118
}

‎jsonb-generator/src/main/java/io/avaje/jsonb/generator/SimpleComponentWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private void writeClassEnd() {
7979
private void writeClassStart() {
8080
final String fullName = metaData.fullName();
8181
final String shortName = Util.shortName(fullName);
82-
writer.append("@Generated").eol();
82+
writer.append("@Generated(\"io.avaje.jsonb.generator\")").eol();
8383
final List<String> factories = metaData.allFactories();
8484
if (!factories.isEmpty()) {
8585
writer.append("@MetaData.Factory({");

‎jsonb/src/main/java/io/avaje/jsonb/stream/NumberParser.java

Lines changed: 4 additions & 189 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,10 @@
55

66
final class NumberParser {
77

8-
// public final static Short SHORT_ZERO = 0;
9-
// public final static Integer INT_ZERO = 0;
10-
// public final static Long LONG_ZERO = 0L;
11-
// public final static Float FLOAT_ZERO = 0f;
12-
// public final static Double DOUBLE_ZERO = 0.0;
13-
14-
// private final static int[] DIGITS = new int[1000];
15-
private final static int[] DIFF = {111, 222, 444, 888, 1776};
16-
private final static int[] ERROR = {50, 100, 200, 400, 800};
17-
private final static int[] SCALE_10 = {10000, 1000, 100, 10, 1};
18-
private final static double[] POW_10 = {
8+
private static final int[] DIFF = {111, 222, 444, 888, 1776};
9+
private static final int[] ERROR = {50, 100, 200, 400, 800};
10+
private static final int[] SCALE_10 = {10000, 1000, 100, 10, 1};
11+
private static final double[] POW_10 = {
1912
1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
2013
1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
2114
1e20, 1e21, 1e22, 1e23, 1e24, 1e25, 1e26, 1e27, 1e28, 1e29,
@@ -699,182 +692,4 @@ static BigInteger deserializeBigInt(JParser reader) {
699692
}
700693
}
701694

702-
// private static final BigDecimal BD_MAX_LONG = BigDecimal.valueOf(Long.MAX_VALUE);
703-
// private static final BigDecimal BD_MIN_LONG = BigDecimal.valueOf(Long.MIN_VALUE);
704-
//
705-
// private static Number bigDecimalOrDouble(BigDecimal num, JsonParser.UnknownNumberParsing unknownNumbers) {
706-
// return unknownNumbers == JsonParser.UnknownNumberParsing.LONG_AND_BIGDECIMAL
707-
// ? num
708-
// : num.doubleValue();
709-
// }
710-
//
711-
// private static Number tryLongFromBigDecimal(final char[] buf, final int len, JsonParser reader) throws IOException {
712-
// final BigDecimal num = parseNumberGeneric(buf, len, reader, false);
713-
// if (num.scale() == 0 && num.precision() <= 19) {
714-
// if (num.signum() == 1) {
715-
// if (num.compareTo(BD_MAX_LONG) <= 0) {
716-
// return num.longValue();
717-
// }
718-
// } else if (num.compareTo(BD_MIN_LONG) >= 0) {
719-
// return num.longValue();
720-
// }
721-
// }
722-
// return bigDecimalOrDouble(num, reader.unknownNumbers);
723-
// }
724-
//
725-
// public static Number deserializeNumber(final JReader reader) throws IOException {
726-
// if (reader.unknownNumbers == JReader.UnknownNumberParsing.BIGDECIMAL) return deserializeDecimal(reader);
727-
// else if (reader.unknownNumbers == JReader.UnknownNumberParsing.DOUBLE) return deserializeDouble(reader);
728-
// final int start = reader.scanNumber();
729-
// int end = reader.getCurrentIndex();
730-
// if (end == reader.length()) {
731-
// NumberInfo info = readLongNumber(reader, start);
732-
// return tryLongFromBigDecimal(info.buffer, info.length, reader);
733-
// }
734-
// int len = end - start;
735-
// if (len > 18) {
736-
// return tryLongFromBigDecimal(reader.prepareBuffer(start, len), len, reader);
737-
// }
738-
// final byte[] buf = reader.buffer;
739-
// final byte ch = buf[start];
740-
// if (ch == '-') {
741-
// return parseNegativeNumber(buf, reader, start, end);
742-
// }
743-
// return parsePositiveNumber(buf, reader, start, end);
744-
// }
745-
//
746-
// private static Number parsePositiveNumber(final byte[] buf, final JReader reader, final int start, final int end) throws IOException {
747-
// long value = 0;
748-
// byte ch = ' ';
749-
// int i = start;
750-
// final boolean leadingZero = buf[start] == 48;
751-
// for (; i < end; i++) {
752-
// ch = buf[i];
753-
// if (ch == '.' || ch == 'e' || ch == 'E') break;
754-
// final int ind = ch - 48;
755-
// if (ind < 0 || ind > 9) {
756-
// if (leadingZero && i > start + 1) {
757-
// numberException(reader, start, end, "Leading zero is not allowed");
758-
// }
759-
// if (i > start && reader.allWhitespace(i, end)) return value;
760-
// return tryLongFromBigDecimal(reader.prepareBuffer(start, end - start), end - start, reader);
761-
// }
762-
// value = (value << 3) + (value << 1) + ind;
763-
// }
764-
// if (i == start) numberException(reader, start, end, "Digit not found");
765-
// else if (leadingZero && ch != '.' && i > start + 1) numberException(reader, start, end, "Leading zero is not allowed");
766-
// else if (i == end) return value;
767-
// else if (ch == '.') {
768-
// i++;
769-
// if (i == end) numberException(reader, start, end, "Number ends with a dot");
770-
// int dp = i;
771-
// for (; i < end; i++) {
772-
// ch = buf[i];
773-
// if (ch == 'e' || ch == 'E') break;
774-
// final int ind = ch - 48;
775-
// if (ind < 0 || ind > 9) {
776-
// if (reader.allWhitespace(i, end)) return BigDecimal.valueOf(value, i - dp);
777-
// return tryLongFromBigDecimal(reader.prepareBuffer(start, end - start), end - start, reader);
778-
// }
779-
// value = (value << 3) + (value << 1) + ind;
780-
// }
781-
// if (i == end) return bigDecimalOrDouble(BigDecimal.valueOf(value, end - dp), reader.unknownNumbers);
782-
// else if (ch == 'e' || ch == 'E') {
783-
// final int ep = i;
784-
// i++;
785-
// ch = buf[i];
786-
// final int exp;
787-
// if (ch == '-') {
788-
// exp = parseNegativeInt(buf, reader, i, end);
789-
// } else if (ch == '+') {
790-
// exp = parsePositiveInt(buf, reader, i, end, 1);
791-
// } else {
792-
// exp = parsePositiveInt(buf, reader, i, end, 0);
793-
// }
794-
// return bigDecimalOrDouble(BigDecimal.valueOf(value, ep - dp - exp), reader.unknownNumbers);
795-
// }
796-
// return BigDecimal.valueOf(value, end - dp);
797-
// } else if (ch == 'e' || ch == 'E') {
798-
// i++;
799-
// ch = buf[i];
800-
// final int exp;
801-
// if (ch == '-') {
802-
// exp = parseNegativeInt(buf, reader, i, end);
803-
// } else if (ch == '+') {
804-
// exp = parsePositiveInt(buf, reader, i, end, 1);
805-
// } else {
806-
// exp = parsePositiveInt(buf, reader, i, end, 0);
807-
// }
808-
// return bigDecimalOrDouble(BigDecimal.valueOf(value, -exp), reader.unknownNumbers);
809-
// }
810-
// return bigDecimalOrDouble(BigDecimal.valueOf(value), reader.unknownNumbers);
811-
// }
812-
//
813-
// private static Number parseNegativeNumber(final byte[] buf, final JReader reader, final int start, final int end) throws IOException {
814-
// long value = 0;
815-
// byte ch = ' ';
816-
// int i = start + 1;
817-
// final boolean leadingZero = buf[start + 1] == 48;
818-
// for (; i < end; i++) {
819-
// ch = buf[i];
820-
// if (ch == '.' || ch == 'e' || ch == 'E') break;
821-
// final int ind = ch - 48;
822-
// if (ind < 0 || ind > 9) {
823-
// if (leadingZero && i > start + 2) {
824-
// numberException(reader, start, end, "Leading zero is not allowed");
825-
// }
826-
// if (i > start + 1 && reader.allWhitespace(i, end)) return value;
827-
// return tryLongFromBigDecimal(reader.prepareBuffer(start, end - start), end - start, reader);
828-
// }
829-
// value = (value << 3) + (value << 1) - ind;
830-
// }
831-
// if (i == start + 1) numberException(reader, start, end, "Digit not found");
832-
// else if (leadingZero && ch != '.' && i > start + 2) numberException(reader, start, end, "Leading zero is not allowed");
833-
// else if (i == end) return value;
834-
// else if (ch == '.') {
835-
// i++;
836-
// if (i == end) numberException(reader, start, end, "Number ends with a dot");
837-
// int dp = i;
838-
// for (; i < end; i++) {
839-
// ch = buf[i];
840-
// if (ch == 'e' || ch == 'E') break;
841-
// final int ind = ch - 48;
842-
// if (ind < 0 || ind > 9) {
843-
// if (reader.allWhitespace(i, end)) return BigDecimal.valueOf(value, i - dp);
844-
// return tryLongFromBigDecimal(reader.prepareBuffer(start, end - start), end - start, reader);
845-
// }
846-
// value = (value << 3) + (value << 1) - ind;
847-
// }
848-
// if (i == end) return bigDecimalOrDouble(BigDecimal.valueOf(value, end - dp), reader.unknownNumbers);
849-
// else if (ch == 'e' || ch == 'E') {
850-
// final int ep = i;
851-
// i++;
852-
// ch = buf[i];
853-
// final int exp;
854-
// if (ch == '-') {
855-
// exp = parseNegativeInt(buf, reader, i, end);
856-
// } else if (ch == '+') {
857-
// exp = parsePositiveInt(buf, reader, i, end, 1);
858-
// } else {
859-
// exp = parsePositiveInt(buf, reader, i, end, 0);
860-
// }
861-
// return bigDecimalOrDouble(BigDecimal.valueOf(value, ep - dp - exp), reader.unknownNumbers);
862-
// }
863-
// return bigDecimalOrDouble(BigDecimal.valueOf(value, end - dp), reader.unknownNumbers);
864-
// } else if (ch == 'e' || ch == 'E') {
865-
// i++;
866-
// ch = buf[i];
867-
// final int exp;
868-
// if (ch == '-') {
869-
// exp = parseNegativeInt(buf, reader, i, end);
870-
// } else if (ch == '+') {
871-
// exp = parsePositiveInt(buf, reader, i, end, 1);
872-
// } else {
873-
// exp = parsePositiveInt(buf, reader, i, end, 0);
874-
// }
875-
// return bigDecimalOrDouble(BigDecimal.valueOf(value, -exp), reader.unknownNumbers);
876-
// }
877-
// return bigDecimalOrDouble(BigDecimal.valueOf(value), reader.unknownNumbers);
878-
// }
879-
880695
}

0 commit comments

Comments
 (0)