Skip to content

Commit da4bcf0

Browse files
rob-bygraverob-bygrave
authored
Merge pull request #202 from avaje/feature/tidy
Sonar improvements from #193
2 parents 75c14b3 + 46d4269 commit da4bcf0

File tree

6 files changed

+60
-136
lines changed

6 files changed

+60
-136
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -875,16 +875,14 @@ private void toFixedFormat(int firstDigit, int decPoint) {
875875
}
876876
end += 2 - decPoint;
877877
}
878-
} else if (point > end) {
879-
// large integer, add trailing zeroes
880-
for (int i = end; i < point; i++) {
881-
chars[i] = '0';
882-
}
883-
end += point - end;
884-
chars[end] = '.';
885-
chars[end + 1] = '0';
886-
end += 2;
887878
} else {
879+
if (point > end) {
880+
// large integer, add trailing zeroes
881+
for (int i = end; i < point; i++) {
882+
chars[i] = '0';
883+
}
884+
end += point - end;
885+
}
888886
chars[end] = '.';
889887
chars[end + 1] = '0';
890888
end += 2;
@@ -918,6 +916,6 @@ private void toExponentialFormat(int firstDigit, int decPoint) {
918916
} while (exp != 0);
919917
}
920918

921-
final static byte[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
919+
static final byte[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
922920
}
923921
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public boolean hasNextElement() {
6363
return reader.hasNextElement();
6464
}
6565

66-
public boolean hasNextStreamElement() {
66+
@Override
67+
public boolean hasNextStreamElement() {
6768
return reader.hasNextStreamElement();
6869
}
6970

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import io.avaje.jsonb.JsonReader;
44
import io.avaje.jsonb.JsonWriter;
5-
import io.avaje.jsonb.Jsonb.Builder;
65
import io.avaje.jsonb.spi.*;
76

87
import java.io.*;

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

Lines changed: 44 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package io.avaje.jsonb.stream;
22

3-
import io.avaje.jsonb.JsonIoException;
43
import io.avaje.jsonb.JsonWriter;
54
import io.avaje.jsonb.spi.PropertyNames;
65

7-
import java.io.IOException;
86
import java.math.BigDecimal;
97
import java.math.BigInteger;
108
import java.util.Collection;
@@ -24,7 +22,7 @@ final class JsonWriteAdapter implements JsonWriter {
2422
this.generator = generator;
2523
this.serializeNulls = serializeNulls;
2624
this.serializeEmpty = serializeEmpty;
27-
this.recycler=recycler;
25+
this.recycler = recycler;
2826
}
2927

3028
@Override
@@ -80,12 +78,8 @@ public String path() {
8078

8179
@Override
8280
public void beginArray() {
83-
try {
84-
writeDeferredName();
85-
generator.startArray();
86-
} catch (IOException e) {
87-
throw new JsonIoException(e);
88-
}
81+
writeDeferredName();
82+
generator.startArray();
8983
}
9084

9185
@Override
@@ -95,22 +89,14 @@ public void endArray() {
9589

9690
@Override
9791
public void beginObject() {
98-
try {
99-
writeDeferredName();
100-
generator.startObject();
101-
} catch (IOException e) {
102-
throw new JsonIoException(e);
103-
}
92+
writeDeferredName();
93+
generator.startObject();
10494
}
10595

10696
@Override
10797
public void beginObject(PropertyNames names) {
108-
try {
109-
writeDeferredName();
110-
generator.startObject((JsonNames) names);
111-
} catch (IOException e) {
112-
throw new JsonIoException(e);
113-
}
98+
writeDeferredName();
99+
generator.startObject((JsonNames) names);
114100
}
115101

116102
@Override
@@ -133,7 +119,7 @@ public void name(int position) {
133119
this.namePos = position;
134120
}
135121

136-
void writeDeferredName() throws IOException {
122+
void writeDeferredName() {
137123
if (namePos > -1) {
138124
generator.writeName(namePos);
139125
namePos = -1;
@@ -146,13 +132,9 @@ void writeDeferredName() throws IOException {
146132
@Override
147133
public void emptyArray() {
148134
if (serializeEmpty) {
149-
try {
150-
writeDeferredName();
151-
generator.startArray();
152-
generator.endArray();
153-
} catch (IOException e) {
154-
throw new JsonIoException(e);
155-
}
135+
writeDeferredName();
136+
generator.startArray();
137+
generator.endArray();
156138
} else if (namePos >= 0) {
157139
namePos = -1;
158140
} else if (deferredName != null) {
@@ -162,17 +144,13 @@ public void emptyArray() {
162144

163145
@Override
164146
public void nullValue() {
165-
try {
166-
if (serializeNulls) {
167-
writeDeferredName();
168-
generator.writeNull();
169-
} else if (namePos >= 0) {
170-
namePos = -1;
171-
} else if (deferredName != null) {
172-
deferredName = null;
173-
}
174-
} catch (IOException e) {
175-
throw new JsonIoException(e);
147+
if (serializeNulls) {
148+
writeDeferredName();
149+
generator.writeNull();
150+
} else if (namePos >= 0) {
151+
namePos = -1;
152+
} else if (deferredName != null) {
153+
deferredName = null;
176154
}
177155
}
178156

@@ -181,67 +159,43 @@ public void value(String value) {
181159
if (value == null) {
182160
nullValue();
183161
} else {
184-
try {
185-
writeDeferredName();
186-
generator.write(value);
187-
} catch (IOException e) {
188-
throw new JsonIoException(e);
189-
}
162+
writeDeferredName();
163+
generator.write(value);
190164
}
191165
}
192166

193167
@Override
194168
public void value(boolean value) {
195-
try {
196-
writeDeferredName();
197-
generator.write(value);
198-
} catch (IOException e) {
199-
throw new JsonIoException(e);
200-
}
169+
writeDeferredName();
170+
generator.write(value);
201171
}
202172

203173

204174
@Override
205175
public void value(int value) {
206-
try {
207-
writeDeferredName();
208-
generator.write(value);
209-
} catch (IOException e) {
210-
throw new JsonIoException(e);
211-
}
176+
writeDeferredName();
177+
generator.write(value);
212178
}
213179

214180
@Override
215181
public void value(long value) {
216-
try {
217-
writeDeferredName();
218-
generator.write(value);
219-
} catch (IOException e) {
220-
throw new JsonIoException(e);
221-
}
182+
writeDeferredName();
183+
generator.write(value);
222184
}
223185

224186
@Override
225187
public void value(double value) {
226-
try {
227-
writeDeferredName();
228-
generator.write(value);
229-
} catch (IOException e) {
230-
throw new JsonIoException(e);
231-
}
188+
writeDeferredName();
189+
generator.write(value);
232190
}
233191

234192
@Override
235193
public void value(Boolean value) {
236194
if (value == null) {
237195
nullValue();
238196
} else {
239-
try {
240-
writeDeferredName();
241-
generator.write(value);
242-
} catch (IOException e) {
243-
throw new JsonIoException(e);
244-
}
197+
writeDeferredName();
198+
generator.write(value);
245199
}
246200
}
247201

@@ -250,12 +204,8 @@ public void value(Integer value) {
250204
if (value == null) {
251205
nullValue();
252206
} else {
253-
try {
254-
writeDeferredName();
255-
generator.write(value);
256-
} catch (IOException e) {
257-
throw new JsonIoException(e);
258-
}
207+
writeDeferredName();
208+
generator.write(value);
259209
}
260210
}
261211

@@ -264,12 +214,8 @@ public void value(Long value) {
264214
if (value == null) {
265215
nullValue();
266216
} else {
267-
try {
268-
writeDeferredName();
269-
generator.write(value);
270-
} catch (IOException e) {
271-
throw new JsonIoException(e);
272-
}
217+
writeDeferredName();
218+
generator.write(value);
273219
}
274220
}
275221

@@ -278,12 +224,8 @@ public void value(Double value) {
278224
if (value == null) {
279225
nullValue();
280226
} else {
281-
try {
282-
writeDeferredName();
283-
generator.write(value);
284-
} catch (IOException e) {
285-
throw new JsonIoException(e);
286-
}
227+
writeDeferredName();
228+
generator.write(value);
287229
}
288230
}
289231

@@ -292,12 +234,8 @@ public void value(BigDecimal value) {
292234
if (value == null) {
293235
nullValue();
294236
} else {
295-
try {
296-
writeDeferredName();
297-
generator.write(value);
298-
} catch (IOException e) {
299-
throw new JsonIoException(e);
300-
}
237+
writeDeferredName();
238+
generator.write(value);
301239
}
302240
}
303241

@@ -306,12 +244,8 @@ public void value(BigInteger value) {
306244
if (value == null) {
307245
nullValue();
308246
} else {
309-
try {
310-
writeDeferredName();
311-
generator.write(value);
312-
} catch (IOException e) {
313-
throw new JsonIoException(e);
314-
}
247+
writeDeferredName();
248+
generator.write(value);
315249
}
316250
}
317251

@@ -320,12 +254,8 @@ public void value(byte[] value) {
320254
if (value == null) {
321255
nullValue();
322256
} else {
323-
try {
324-
writeDeferredName();
325-
generator.write(value);
326-
} catch (IOException e) {
327-
throw new JsonIoException(e);
328-
}
257+
writeDeferredName();
258+
generator.write(value);
329259
}
330260
}
331261

@@ -334,12 +264,8 @@ public void rawValue(String value) {
334264
if (value == null) {
335265
nullValue();
336266
} else {
337-
try {
338-
writeDeferredName();
339-
generator.writeRaw(value);
340-
} catch (IOException e) {
341-
throw new JsonIoException(e);
342-
}
267+
writeDeferredName();
268+
generator.writeRaw(value);
343269
}
344270
}
345271

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ final class NumberWriter {
55
private static final byte MINUS = '-';
66
private static final byte[] MIN_INT = "-2147483648".getBytes();
77
private static final byte[] MIN_LONG = "-9223372036854775808".getBytes();
8-
private final static int[] DIGITS = new int[1000];
8+
private static final int[] DIGITS = new int[1000];
99

1010
static {
1111
for (int i = 0; i < DIGITS.length; i++) {
@@ -16,6 +16,8 @@ final class NumberWriter {
1616
}
1717
}
1818

19+
private NumberWriter() {}
20+
1921
static void writeInt(final int value, final JGenerator sw) {
2022
final byte[] buf = sw.ensureCapacity(11);
2123
final int position = sw.position();

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ private static JParser createParser() {
3232
}
3333

3434
/**
35-
* Default {@link BufferRecycler} implementation that uses {@link ThreadLocal} for recycling
36-
* instances. {@link BufferRecycler} instances are stored using {@link
37-
* java.lang.ref.SoftReference}s so that they may be Garbage Collected as needed by JVM.
35+
* Default {@link BufferRecycler} implementation that uses {@link ThreadLocal}
36+
* for recycling instances.
3837
*
39-
* <p>Note that this implementation may not work well on platforms where {@link
40-
* java.lang.ref.SoftReference}s are not well supported (like Android), or on platforms where
38+
* <p>Note that this implementation may not work well on platforms where
4139
* {@link java.lang.Thread}s are not long-living or reused (like Project Loom).
4240
*/
4341
static final class ThreadLocalPool implements BufferRecycler {

0 commit comments

Comments
 (0)