Skip to content

Commit 079255e

Browse files
minborgminborg
committedJan 23, 2023
8300864: Declare some fields in java.io as final
Reviewed-by: rriggs, lancea
1 parent a56598f commit 079255e

8 files changed

+112
-112
lines changed
 

‎src/java.base/share/classes/java/io/BufferedInputStream.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@
5555
*/
5656
public class BufferedInputStream extends FilterInputStream {
5757

58-
private static int DEFAULT_BUFFER_SIZE = 8192;
58+
private static final int DEFAULT_BUFFER_SIZE = 8192;
5959

6060
/**
6161
* As this class is used early during bootstrap, it's motivated to use

‎src/java.base/share/classes/java/io/BufferedReader.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -85,8 +85,8 @@ public class BufferedReader extends Reader {
8585
/** The skipLF flag when the mark was set */
8686
private boolean markedSkipLF = false;
8787

88-
private static int defaultCharBufferSize = 8192;
89-
private static int defaultExpectedLineLength = 80;
88+
private static final int DEFAULT_CHAR_BUFFER_SIZE = 8192;
89+
private static final int DEFAULT_EXPECTED_LINE_LENGTH = 80;
9090

9191
/**
9292
* Creates a buffering character-input stream that uses an input buffer of
@@ -113,7 +113,7 @@ public BufferedReader(Reader in, int sz) {
113113
* @param in A Reader
114114
*/
115115
public BufferedReader(Reader in) {
116-
this(in, defaultCharBufferSize);
116+
this(in, DEFAULT_CHAR_BUFFER_SIZE);
117117
}
118118

119119
/** Checks to make sure that the stream has not been closed */
@@ -414,7 +414,7 @@ private String implReadLine(boolean ignoreLF, boolean[] term) throws IOException
414414
}
415415

416416
if (s == null)
417-
s = new StringBuilder(defaultExpectedLineLength);
417+
s = new StringBuilder(DEFAULT_EXPECTED_LINE_LENGTH);
418418
s.append(cb, startChar, i - startChar);
419419
}
420420
}

‎src/java.base/share/classes/java/io/ExpiringCache.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -28,21 +28,21 @@
2828

2929
package java.io;
3030

31-
import java.util.Iterator;
3231
import java.util.Map;
3332
import java.util.LinkedHashMap;
3433
import java.util.Set;
3534

3635
class ExpiringCache {
37-
private long millisUntilExpiration;
38-
private Map<String,Entry> map;
36+
37+
private static final int QUERY_OVERFLOW = 300;
38+
private static final int MAX_ENTRIES = 200;
39+
private final long millisUntilExpiration;
40+
private final Map<String,Entry> map;
3941
// Clear out old entries every few queries
4042
private int queryCount;
41-
private int queryOverflow = 300;
42-
private int MAX_ENTRIES = 200;
4343

4444
static class Entry {
45-
private long timestamp;
45+
private long timestamp;
4646
private String val;
4747

4848
Entry(long timestamp, String val) {
@@ -72,7 +72,7 @@ protected boolean removeEldestEntry(Map.Entry<String,Entry> eldest) {
7272
}
7373

7474
synchronized String get(String key) {
75-
if (++queryCount >= queryOverflow) {
75+
if (++queryCount >= QUERY_OVERFLOW) {
7676
cleanup();
7777
}
7878
Entry entry = entryFor(key);
@@ -83,7 +83,7 @@ synchronized String get(String key) {
8383
}
8484

8585
synchronized void put(String key, String val) {
86-
if (++queryCount >= queryOverflow) {
86+
if (++queryCount >= QUERY_OVERFLOW) {
8787
cleanup();
8888
}
8989
Entry entry = entryFor(key);

‎src/java.base/share/classes/java/io/File.java

+66-66
Large diffs are not rendered by default.

‎src/java.base/share/classes/java/io/FileOutputStream.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1994, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -72,7 +72,7 @@ public class FileOutputStream extends OutputStream
7272
/**
7373
* Access to FileDescriptor internals.
7474
*/
75-
private static final JavaIOFileDescriptorAccess fdAccess =
75+
private static final JavaIOFileDescriptorAccess FD_ACCESS =
7676
SharedSecrets.getJavaIOFileDescriptorAccess();
7777

7878
/**
@@ -316,7 +316,7 @@ private void open(String name, boolean append) throws FileNotFoundException {
316316
*/
317317
@Override
318318
public void write(int b) throws IOException {
319-
boolean append = fdAccess.getAppend(fd);
319+
boolean append = FD_ACCESS.getAppend(fd);
320320
long comp = Blocker.begin();
321321
try {
322322
write(b, append);
@@ -346,7 +346,7 @@ private native void writeBytes(byte[] b, int off, int len, boolean append)
346346
*/
347347
@Override
348348
public void write(byte[] b) throws IOException {
349-
boolean append = fdAccess.getAppend(fd);
349+
boolean append = FD_ACCESS.getAppend(fd);
350350
long comp = Blocker.begin();
351351
try {
352352
writeBytes(b, 0, b.length, append);
@@ -367,7 +367,7 @@ public void write(byte[] b) throws IOException {
367367
*/
368368
@Override
369369
public void write(byte[] b, int off, int len) throws IOException {
370-
boolean append = fdAccess.getAppend(fd);
370+
boolean append = FD_ACCESS.getAppend(fd);
371371
long comp = Blocker.begin();
372372
try {
373373
writeBytes(b, off, len, append);

‎src/java.base/share/classes/java/io/ObjectStreamClass.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1905,7 +1905,7 @@ public MemberSignature(Method meth) {
19051905
private static class FieldReflector {
19061906

19071907
/** handle for performing unsafe operations */
1908-
private static final Unsafe unsafe = Unsafe.getUnsafe();
1908+
private static final Unsafe UNSAFE = Unsafe.getUnsafe();
19091909

19101910
/** fields to operate on */
19111911
private final ObjectStreamField[] fields;
@@ -1944,7 +1944,7 @@ private static class FieldReflector {
19441944
ObjectStreamField f = fields[i];
19451945
Field rf = f.getField();
19461946
long key = (rf != null) ?
1947-
unsafe.objectFieldOffset(rf) : Unsafe.INVALID_FIELD_OFFSET;
1947+
UNSAFE.objectFieldOffset(rf) : Unsafe.INVALID_FIELD_OFFSET;
19481948
readKeys[i] = key;
19491949
writeKeys[i] = usedKeys.add(key) ?
19501950
key : Unsafe.INVALID_FIELD_OFFSET;
@@ -1986,14 +1986,14 @@ void getPrimFieldValues(Object obj, byte[] buf) {
19861986
long key = readKeys[i];
19871987
int off = offsets[i];
19881988
switch (typeCodes[i]) {
1989-
case 'Z' -> Bits.putBoolean(buf, off, unsafe.getBoolean(obj, key));
1990-
case 'B' -> buf[off] = unsafe.getByte(obj, key);
1991-
case 'C' -> Bits.putChar(buf, off, unsafe.getChar(obj, key));
1992-
case 'S' -> Bits.putShort(buf, off, unsafe.getShort(obj, key));
1993-
case 'I' -> Bits.putInt(buf, off, unsafe.getInt(obj, key));
1994-
case 'F' -> Bits.putFloat(buf, off, unsafe.getFloat(obj, key));
1995-
case 'J' -> Bits.putLong(buf, off, unsafe.getLong(obj, key));
1996-
case 'D' -> Bits.putDouble(buf, off, unsafe.getDouble(obj, key));
1989+
case 'Z' -> Bits.putBoolean(buf, off, UNSAFE.getBoolean(obj, key));
1990+
case 'B' -> buf[off] = UNSAFE.getByte(obj, key);
1991+
case 'C' -> Bits.putChar(buf, off, UNSAFE.getChar(obj, key));
1992+
case 'S' -> Bits.putShort(buf, off, UNSAFE.getShort(obj, key));
1993+
case 'I' -> Bits.putInt(buf, off, UNSAFE.getInt(obj, key));
1994+
case 'F' -> Bits.putFloat(buf, off, UNSAFE.getFloat(obj, key));
1995+
case 'J' -> Bits.putLong(buf, off, UNSAFE.getLong(obj, key));
1996+
case 'D' -> Bits.putDouble(buf, off, UNSAFE.getDouble(obj, key));
19971997
default -> throw new InternalError();
19981998
}
19991999
}
@@ -2015,14 +2015,14 @@ void setPrimFieldValues(Object obj, byte[] buf) {
20152015
}
20162016
int off = offsets[i];
20172017
switch (typeCodes[i]) {
2018-
case 'Z' -> unsafe.putBoolean(obj, key, Bits.getBoolean(buf, off));
2019-
case 'B' -> unsafe.putByte(obj, key, buf[off]);
2020-
case 'C' -> unsafe.putChar(obj, key, Bits.getChar(buf, off));
2021-
case 'S' -> unsafe.putShort(obj, key, Bits.getShort(buf, off));
2022-
case 'I' -> unsafe.putInt(obj, key, Bits.getInt(buf, off));
2023-
case 'F' -> unsafe.putFloat(obj, key, Bits.getFloat(buf, off));
2024-
case 'J' -> unsafe.putLong(obj, key, Bits.getLong(buf, off));
2025-
case 'D' -> unsafe.putDouble(obj, key, Bits.getDouble(buf, off));
2018+
case 'Z' -> UNSAFE.putBoolean(obj, key, Bits.getBoolean(buf, off));
2019+
case 'B' -> UNSAFE.putByte(obj, key, buf[off]);
2020+
case 'C' -> UNSAFE.putChar(obj, key, Bits.getChar(buf, off));
2021+
case 'S' -> UNSAFE.putShort(obj, key, Bits.getShort(buf, off));
2022+
case 'I' -> UNSAFE.putInt(obj, key, Bits.getInt(buf, off));
2023+
case 'F' -> UNSAFE.putFloat(obj, key, Bits.getFloat(buf, off));
2024+
case 'J' -> UNSAFE.putLong(obj, key, Bits.getLong(buf, off));
2025+
case 'D' -> UNSAFE.putDouble(obj, key, Bits.getDouble(buf, off));
20262026
default -> throw new InternalError();
20272027
}
20282028
}
@@ -2043,7 +2043,7 @@ void getObjFieldValues(Object obj, Object[] vals) {
20432043
*/
20442044
for (int i = numPrimFields; i < fields.length; i++) {
20452045
vals[offsets[i]] = switch (typeCodes[i]) {
2046-
case 'L', '[' -> unsafe.getReference(obj, readKeys[i]);
2046+
case 'L', '[' -> UNSAFE.getReference(obj, readKeys[i]);
20472047
default -> throw new InternalError();
20482048
};
20492049
}
@@ -2094,7 +2094,7 @@ private void setObjFieldValues(Object obj, Object[] vals, boolean dryRun) {
20942094
obj.getClass().getName());
20952095
}
20962096
if (!dryRun)
2097-
unsafe.putReference(obj, key, val);
2097+
UNSAFE.putReference(obj, key, val);
20982098
}
20992099
default -> throw new InternalError();
21002100
}

‎src/java.base/share/classes/java/io/StringReader.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,8 @@
3636

3737
public class StringReader extends Reader {
3838

39+
private final int length;
3940
private String str;
40-
private int length;
4141
private int next = 0;
4242
private int mark = 0;
4343

@@ -47,8 +47,8 @@ public class StringReader extends Reader {
4747
* @param s String providing the character stream.
4848
*/
4949
public StringReader(String s) {
50-
this.str = s;
5150
this.length = s.length();
51+
this.str = s;
5252
}
5353

5454
/** Check to make sure that the stream has not been closed */

‎src/java.base/share/classes/java/io/StringWriter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
public class StringWriter extends Writer {
4444

45-
private StringBuffer buf;
45+
private final StringBuffer buf;
4646

4747
/**
4848
* Create a new string writer using the default initial string-buffer

0 commit comments

Comments
 (0)
Please sign in to comment.