Skip to content

Commit 0e791ab

Browse files
committed
Merge pull request #125 from goncalossilva/minor_cleanup
Minor cleanup
2 parents e78fc1f + 9580482 commit 0e791ab

File tree

8 files changed

+9
-19
lines changed

8 files changed

+9
-19
lines changed

src/main/java/com/fasterxml/jackson/core/Base64Variants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public final class Base64Variants
6464
*/
6565
public final static Base64Variant MODIFIED_FOR_URL;
6666
static {
67-
StringBuffer sb = new StringBuffer(STD_BASE64_ALPHABET);
67+
StringBuilder sb = new StringBuilder(STD_BASE64_ALPHABET);
6868
// Replace plus with hyphen, slash with underscore (and no padding)
6969
sb.setCharAt(sb.indexOf("+"), '-');
7070
sb.setCharAt(sb.indexOf("/"), '_');

src/main/java/com/fasterxml/jackson/core/JsonFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public static int collectDefaults() {
249249
* and this reuse only works within context of a single
250250
* factory instance.
251251
*/
252-
public JsonFactory() { this((ObjectCodec) null); }
252+
public JsonFactory() { this(null); }
253253

254254
public JsonFactory(ObjectCodec oc) { _objectCodec = oc; }
255255

src/main/java/com/fasterxml/jackson/core/JsonGenerationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ public JsonGenerationException(String msg)
2727

2828
public JsonGenerationException(String msg, Throwable rootCause)
2929
{
30-
super(msg, (JsonLocation)null, rootCause);
30+
super(msg, null, rootCause);
3131
}
3232
}

src/main/java/com/fasterxml/jackson/core/Version.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,7 @@ public Version(int major, int minor, int patchLevel, String snapshotInfo,
7676
public String getArtifactId() { return _artifactId; }
7777

7878
public String toFullString() {
79-
return new StringBuilder()
80-
.append(_groupId)
81-
.append('/')
82-
.append(_artifactId)
83-
.append('/')
84-
.append(toString())
85-
.toString();
79+
return _groupId + '/' + _artifactId + '/' + toString();
8680
}
8781

8882
@Override

src/main/java/com/fasterxml/jackson/core/io/UTF32Reader.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,7 @@ private boolean loadMore(int available) throws IOException {
201201
// Bytes that need to be moved to the beginning of buffer?
202202
if (available > 0) {
203203
if (_ptr > 0) {
204-
for (int i = 0; i < available; ++i) {
205-
_buffer[i] = _buffer[_ptr+i];
206-
}
204+
System.arraycopy(_buffer, _ptr, _buffer, 0, available);
207205
_ptr = 0;
208206
}
209207
_length = available;

src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2792,7 +2792,7 @@ protected char _decodeEscaped() throws IOException
27922792
}
27932793
int c = (int) _inputBuffer[_inputPtr++];
27942794

2795-
switch ((int) c) {
2795+
switch (c) {
27962796
// First, ones that are mapped
27972797
case 'b':
27982798
return '\b';
@@ -2838,7 +2838,7 @@ protected char _decodeEscaped() throws IOException
28382838

28392839
protected int _decodeCharForError(int firstByte) throws IOException
28402840
{
2841-
int c = (int) firstByte;
2841+
int c = firstByte;
28422842
if (c < 0) { // if >= 0, is ascii and fine as is
28432843
int needed;
28442844

src/main/java/com/fasterxml/jackson/core/sym/BytesToNameCanonicalizer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,9 +1049,7 @@ private static Name constructName(int hash, String name, int[] quads, int qlen)
10491049
}
10501050
// Otherwise, need to copy the incoming buffer
10511051
int[] buf = new int[qlen];
1052-
for (int i = 0; i < qlen; ++i) {
1053-
buf[i] = quads[i];
1054-
}
1052+
System.arraycopy(quads, 0, buf, 0, qlen);
10551053
return new NameN(name, hash, buf, qlen);
10561054
}
10571055

src/main/java/com/fasterxml/jackson/core/util/TextBuffer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ private char[] resultArray()
700700
final char[] result = carr(size);
701701
if (_segments != null) {
702702
for (int i = 0, len = _segments.size(); i < len; ++i) {
703-
char[] curr = (char[]) _segments.get(i);
703+
char[] curr = _segments.get(i);
704704
int currLen = curr.length;
705705
System.arraycopy(curr, 0, result, offset, currLen);
706706
offset += currLen;

0 commit comments

Comments
 (0)