Skip to content

Commit 77cb322

Browse files
He-PinHe-Pin
authored
chore: fix some lint errors (#594)
Fix some lint errors.
1 parent 8a23933 commit 77cb322

25 files changed

Lines changed: 89 additions & 102 deletions

‎readme.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ Here's the latest set of benchmarks I've run (as of 18 May 2023) comparing Sjso
196196
google/go-jsonnet and google/jsonnet, measuring the time taken to
197197
evaluate an arbitrary config file in the Databricks codebase:
198198

199-
| | Sjsonnet 0.4.3 | google/go-jsonnet 0.20.0 | google/jsonnet 0.20.0 |
200-
| :----------- | -------------: | -------------: | -------------: |
201-
| staging/runbot-app.jsonnet (~6.6mb output JSON) | ~0.10s | ~6.5s | ~67s |
199+
| | Sjsonnet 0.4.3 | google/go-jsonnet 0.20.0 | google/jsonnet 0.20.0 |
200+
|:------------------------------------------------|---------------:|-------------------------:|----------------------:|
201+
| staging/runbot-app.jsonnet (~6.6mb output JSON) | ~0.10s | ~6.5s | ~67s |
202202

203203
Sjsonnet was run as a long-lived daemon to keep the JVM warm,
204204
while go-jsonnet and google/jsonnet were run as subprocesses, following typical

‎sjsonnet/client/src/sjsonnet/client/InputPumper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import java.io.OutputStream;
55

66
public class InputPumper implements Runnable{
7-
private InputStream src;
8-
private OutputStream dest;
9-
private Boolean checkAvailable;
7+
private final InputStream src;
8+
private final OutputStream dest;
9+
private final Boolean checkAvailable;
1010
public InputPumper(InputStream src,
1111
OutputStream dest,
1212
Boolean checkAvailable){

‎sjsonnet/client/src/sjsonnet/client/Locked.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package sjsonnet.client;
22

3-
import java.io.RandomAccessFile;
4-
import java.nio.channels.FileChannel;
5-
import java.util.concurrent.locks.ReentrantLock;
6-
7-
83
public interface Locked{
9-
public void release() throws Exception;
4+
void release() throws Exception;
105
}

‎sjsonnet/client/src/sjsonnet/client/Locks.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.RandomAccessFile;
44
import java.nio.channels.FileChannel;
5-
import java.util.concurrent.locks.ReentrantLock;
65

76
public class Locks implements AutoCloseable{
87
public Lock processLock;
@@ -26,7 +25,7 @@ public void close() throws Exception {
2625
}
2726
}
2827
class FileLocked implements Locked{
29-
private java.nio.channels.FileLock lock;
28+
private final java.nio.channels.FileLock lock;
3029
public FileLocked(java.nio.channels.FileLock lock){
3130
this.lock = lock;
3231
}
@@ -36,7 +35,7 @@ public void release() throws Exception{
3635
}
3736

3837
class FileLock extends Lock{
39-
String path;
38+
final String path;
4039
RandomAccessFile raf;
4140
FileChannel chan;
4241
public FileLock(String path) throws Exception{

‎sjsonnet/client/src/sjsonnet/client/ProxyOutputStream.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.io.IOException;
44

55
public class ProxyOutputStream extends java.io.OutputStream {
6-
private java.io.OutputStream out;
7-
private int key;
6+
private final java.io.OutputStream out;
7+
private final int key;
88
public ProxyOutputStream(java.io.OutputStream out, int key){
99
this.out = out;
1010
this.key = key;

‎sjsonnet/client/src/sjsonnet/client/ProxyStreamPumper.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import java.io.OutputStream;
77

88
public class ProxyStreamPumper implements Runnable{
9-
private InputStream src;
10-
private OutputStream dest1;
11-
private OutputStream dest2;
9+
private final InputStream src;
10+
private final OutputStream dest1;
11+
private final OutputStream dest2;
1212
public ProxyStreamPumper(InputStream src, OutputStream dest1, OutputStream dest2){
1313
this.src = src;
1414
this.dest1 = dest1;
@@ -39,6 +39,7 @@ public void run() {
3939
if (quantity0 > 0) dest1.write(buffer, 0, offset);
4040
else dest2.write(buffer, 0, offset);
4141
}
42+
first = false;
4243
} catch (IOException e) {
4344
// Win32NamedPipeSocket input stream somehow doesn't return -1,
4445
// instead it throws an IOException whose message contains "ReadFile()".

‎sjsonnet/client/src/sjsonnet/client/SjsonnetClientMain.java‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package sjsonnet.client;
22

3-
import org.scalasbt.ipcsocket.*;
3+
import org.scalasbt.ipcsocket.UnixDomainSocket;
4+
import org.scalasbt.ipcsocket.Win32NamedPipeSocket;
45

56
import java.io.*;
67
import java.net.Socket;
7-
import java.net.URISyntaxException;
8-
import java.net.URL;
98
import java.nio.channels.FileChannel;
10-
import java.util.*;
9+
import java.util.ArrayList;
10+
import java.util.List;
11+
import java.util.Map;
1112

1213
public class SjsonnetClientMain {
13-
static void initServer(String lockBase, boolean setJnaNoSys) throws IOException,URISyntaxException{
14+
static void initServer(String lockBase, boolean setJnaNoSys) throws IOException {
1415
List<String> l = new ArrayList<>();
1516
List<String> vmOptions = new ArrayList<>();
1617
l.add("java");
@@ -25,8 +26,9 @@ static void initServer(String lockBase, boolean setJnaNoSys) throws IOException,
2526
} else {
2627
final File vmOptionsFile = new File(lockBase, "vmoptions");
2728
try (PrintWriter out = new PrintWriter(vmOptionsFile)) {
28-
for(String opt: vmOptions)
29-
out.println(opt);
29+
for(String opt: vmOptions) {
30+
out.println(opt);
31+
}
3032
}
3133
l.add("-XX:VMOptionsFile=" + vmOptionsFile.getCanonicalPath());
3234
}
@@ -60,29 +62,23 @@ public static int main0(String[] args) throws Exception{
6062
java.nio.channels.FileLock tryLock = channel.tryLock();
6163
Locks locks = Locks.files(lockBase)){
6264
if (tryLock != null) {
63-
int exitCode = SjsonnetClientMain.run(
65+
return SjsonnetClientMain.run(
6466
lockBase,
65-
new Runnable() {
66-
@Override
67-
public void run() {
68-
try{
69-
initServer(lockBase, setJnaNoSys);
70-
}catch(Exception e){
71-
throw new RuntimeException(e);
72-
}
73-
}
74-
},
67+
() -> {
68+
try {
69+
initServer(lockBase, setJnaNoSys);
70+
} catch (Exception e) {
71+
throw new RuntimeException(e);
72+
}
73+
},
7574
locks,
7675
System.in,
7776
System.out,
7877
System.err,
7978
args,
8079
env
8180
);
82-
return exitCode;
8381
}
84-
} finally{
85-
8682
}
8783
}
8884
throw new Exception("Reached max sjsonnet process limit: " + 5);

‎sjsonnet/client/src/sjsonnet/client/Util.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44
import java.io.IOException;
55
import java.io.InputStream;
66
import java.io.OutputStream;
7+
import java.nio.charset.StandardCharsets;
78
import java.util.HashMap;
89
import java.util.Map;
910

1011
public class Util {
11-
public static boolean isWindows = System.getProperty("os.name").toLowerCase().startsWith("windows");
12+
public static final boolean isWindows = System.getProperty("os.name").toLowerCase().startsWith("windows");
1213
public static boolean isJava9OrAbove = !System.getProperty("java.specification.version").startsWith("1.");
1314

1415
// Windows named pipe prefix (see https://github.com/sbt/ipcsocket/blob/v1.0.0/README.md)
1516
// Win32NamedPipeServerSocket automatically adds this as a prefix (if it is not already is prefixed),
1617
// but Win32NamedPipeSocket does not
1718
// https://github.com/sbt/ipcsocket/blob/v1.0.0/src/main/java/org/scalasbt/ipcsocket/Win32NamedPipeServerSocket.java#L36
18-
public static String WIN32_PIPE_PREFIX = "\\\\.\\pipe\\";
19+
public static final String WIN32_PIPE_PREFIX = "\\\\.\\pipe\\";
1920

2021
public static String[] parseArgs(InputStream argStream) throws IOException {
2122

@@ -70,11 +71,11 @@ public static String readString(InputStream inputStream) throws IOException {
7071
total += res;
7172
}
7273
}
73-
return new String(arr, "UTF-8");
74+
return new String(arr, StandardCharsets.UTF_8);
7475
}
7576

7677
public static void writeString(OutputStream outputStream, String string) throws IOException {
77-
byte[] bytes = string.getBytes("UTF-8");
78+
byte[] bytes = string.getBytes(StandardCharsets.UTF_8);
7879
writeInt(outputStream, bytes.length);
7980
outputStream.write(bytes);
8081
}

‎sjsonnet/client/test/src/sjsonnet/client/ClientTests.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
package sjsonnet;
2-
3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertTrue;
1+
package sjsonnet.client;
52

63
import org.junit.Test;
7-
import sjsonnet.client.ProxyOutputStream;
8-
import sjsonnet.client.ProxyStreamPumper;
9-
import sjsonnet.client.Util;
104

115
import java.io.ByteArrayInputStream;
126
import java.io.ByteArrayOutputStream;
137
import java.io.OutputStream;
14-
import java.util.*;
8+
import java.util.Arrays;
9+
import java.util.Objects;
10+
import java.util.Random;
11+
12+
import static org.junit.Assert.*;
1513

1614
public class ClientTests {
1715
@Test
@@ -27,7 +25,7 @@ public void readWriteInt() throws Exception{
2725
ByteArrayInputStream i = new ByteArrayInputStream(o.toByteArray());
2826
int s = Util.readInt(i);
2927
assertEquals(example, s);
30-
assertEquals(i.available(), 0);
28+
assertEquals(0, i.available());
3129
}
3230
}
3331
}
@@ -48,8 +46,8 @@ public void readWriteString() throws Exception{
4846
@Test
4947
public void readWriteBigString() throws Exception{
5048
int[] lengths = {0, 1, 126, 127, 128, 254, 255, 256, 1024, 99999, 1234567};
51-
for(int i = 0; i < lengths.length; i++){
52-
final char[] bigChars = new char[lengths[i]];
49+
for (final int length : lengths) {
50+
final char[] bigChars = new char[length];
5351
Arrays.fill(bigChars, 'X');
5452
checkStringRoundTrip(new String(bigChars));
5553
}
@@ -61,14 +59,14 @@ public void checkStringRoundTrip(String example) throws Exception{
6159
ByteArrayInputStream i = new ByteArrayInputStream(o.toByteArray());
6260
String s = Util.readString(i);
6361
assertEquals(example, s);
64-
assertEquals(i.available(), 0);
62+
assertEquals(0, i.available());
6563
}
6664

6765
public byte[] readSamples(String ...samples) throws Exception{
6866
ByteArrayOutputStream out = new ByteArrayOutputStream();
6967
for(String sample: samples) {
7068
byte[] bytes = java.nio.file.Files.readAllBytes(
71-
java.nio.file.Paths.get(getClass().getResource(sample).getFile())
69+
java.nio.file.Paths.get(Objects.requireNonNull(getClass().getResource(sample)).getFile())
7270
);
7371
out.write(bytes);
7472
}
@@ -147,8 +145,8 @@ public void proxyInputOutputStreams(byte[] samples1,
147145
dest1, dest2
148146
);
149147
pumper.run();
150-
assertTrue(Arrays.equals(samples1, dest1.toByteArray()));
151-
assertTrue(Arrays.equals(samples2, dest2.toByteArray()));
148+
assertArrayEquals(samples1, dest1.toByteArray());
149+
assertArrayEquals(samples2, dest2.toByteArray());
152150
}
153151

154152
}

‎sjsonnet/client/test/src/sjsonnet/client/Locks.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
package mill.main.client;
2-
3-
import sjsonnet.client.Lock;
4-
import sjsonnet.client.Locked;
5-
import sjsonnet.client.Locks;
1+
package sjsonnet.client;
62

73
import java.util.concurrent.locks.ReentrantLock;
84

95
class MemoryLocked implements Locked{
10-
java.util.concurrent.locks.Lock l;
6+
final java.util.concurrent.locks.Lock l;
117
public MemoryLocked(java.util.concurrent.locks.Lock l){
128
this.l = l;
139
}
@@ -25,7 +21,7 @@ public static Locks memory(){
2521
}};
2622
}
2723

28-
ReentrantLock innerLock = new ReentrantLock(true);
24+
final ReentrantLock innerLock = new ReentrantLock(true);
2925

3026
public boolean probe(){
3127
return !innerLock.isLocked();

0 commit comments

Comments
 (0)