Skip to content

Commit 5c0209c

Browse files
ibauersachsibauersachs
committed
Fix code smells found by Sonar
1 parent 346acf3 commit 5c0209c

7 files changed

Lines changed: 20 additions & 39 deletions

File tree

‎src/main/java/org/xbill/DNS/Client.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ private static void close() {
5858
selectorThread.join();
5959
} catch (InterruptedException | IOException e) {
6060
log.warn("Failed to properly shutdown", e);
61+
Thread.currentThread().interrupt();
6162
}
6263
}
6364

‎src/main/java/org/xbill/DNS/DohResolver.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ private CompletionStage<Message> sendAsync8(final Message query) {
321321
f.complete(response);
322322
} catch (InterruptedException | IOException e) {
323323
f.completeExceptionally(e);
324+
Thread.currentThread().interrupt();
324325
}
325326
});
326327
return f;
@@ -399,6 +400,7 @@ private CompletionStage<Message> sendAsync11(final Message query) {
399400
return failedFuture(new IOException("Query timed out"));
400401
}
401402
} catch (InterruptedException iex) {
403+
Thread.currentThread().interrupt();
402404
return failedFuture(iex);
403405
}
404406

@@ -431,6 +433,7 @@ private CompletionStage<Message> sendAsync11(final Message query) {
431433
if (isInitialRequest) {
432434
initialRequestLock.release();
433435
}
436+
Thread.currentThread().interrupt();
434437
return failedFuture(iex);
435438
}
436439

‎src/main/java/org/xbill/DNS/Resolver.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ default Message send(Message query) throws IOException {
146146
CompletableFuture<Message> result = sendAsync(query).toCompletableFuture();
147147
return result.get(getTimeout().toMillis(), TimeUnit.MILLISECONDS);
148148
} catch (InterruptedException e) {
149+
Thread.currentThread().interrupt();
149150
throw new IOException(e);
150151
} catch (ExecutionException e) {
151152
if (e.getCause() instanceof IOException) {

‎src/main/java/org/xbill/DNS/Zone.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,13 @@ public Zone(Name zone, String file) throws IOException {
141141
if (zone == null) {
142142
throw new IllegalArgumentException("no zone name specified");
143143
}
144-
Master m = new Master(file, zone);
145-
Record record;
144+
try (Master m = new Master(file, zone)) {
145+
Record record;
146146

147-
origin = zone;
148-
while ((record = m.nextRecord()) != null) {
149-
maybeAddRecord(record);
147+
origin = zone;
148+
while ((record = m.nextRecord()) != null) {
149+
maybeAddRecord(record);
150+
}
150151
}
151152
validate();
152153
}

‎src/main/java/org/xbill/DNS/tools/jnamed.java‎

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public jnamed(String conffile) throws IOException, ZoneTransferException {
145145
}
146146
System.out.println("jnamed: running");
147147
} finally {
148-
fs.close();
148+
br.close();
149149
}
150150
}
151151

@@ -552,19 +552,11 @@ public void TCPclient(Socket s) {
552552
}
553553

554554
public void serveTCP(InetAddress addr, int port) {
555-
try {
556-
ServerSocket sock = new ServerSocket(port, 128, addr);
555+
try (ServerSocket sock = new ServerSocket(port, 128, addr)) {
557556
while (true) {
558557
final Socket s = sock.accept();
559558
Thread t;
560-
t =
561-
new Thread(
562-
new Runnable() {
563-
@Override
564-
public void run() {
565-
TCPclient(s);
566-
}
567-
});
559+
t = new Thread(() -> TCPclient(s));
568560
t.start();
569561
}
570562
} catch (IOException e) {
@@ -573,8 +565,7 @@ public void run() {
573565
}
574566

575567
public void serveUDP(InetAddress addr, int port) {
576-
try {
577-
DatagramSocket sock = new DatagramSocket(port, addr);
568+
try (DatagramSocket sock = new DatagramSocket(port, addr)) {
578569
final short udpLength = 512;
579570
byte[] in = new byte[udpLength];
580571
DatagramPacket indp = new DatagramPacket(in, in.length);
@@ -613,28 +604,12 @@ public void serveUDP(InetAddress addr, int port) {
613604
}
614605

615606
public void addTCP(final InetAddress addr, final int port) {
616-
Thread t;
617-
t =
618-
new Thread(
619-
new Runnable() {
620-
@Override
621-
public void run() {
622-
serveTCP(addr, port);
623-
}
624-
});
607+
Thread t = new Thread(() -> serveTCP(addr, port));
625608
t.start();
626609
}
627610

628611
public void addUDP(final InetAddress addr, final int port) {
629-
Thread t;
630-
t =
631-
new Thread(
632-
new Runnable() {
633-
@Override
634-
public void run() {
635-
serveUDP(addr, port);
636-
}
637-
});
612+
Thread t = new Thread(() -> serveUDP(addr, port));
638613
t.start();
639614
}
640615

‎src/main/java/org/xbill/DNS/tools/update.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ public update(InputStream in) {
229229
try {
230230
Thread.sleep(interval);
231231
} catch (InterruptedException e) {
232+
Thread.currentThread().interrupt();
232233
throw new IOException(e);
233234
}
234235
break;

‎src/test/java/org/xbill/DNS/AddressTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,8 @@ void getHostName() throws IOException {
482482
return answer;
483483
});
484484
Lookup.setDefaultResolver(mockResolver);
485-
assertThrows(
486-
UnknownHostException.class,
487-
() -> Address.getHostName(InetAddress.getByName("192.168.1.1")));
485+
InetAddress address = InetAddress.getByName("192.168.1.1");
486+
assertThrows(UnknownHostException.class, () -> Address.getHostName(address));
488487

489488
// reset resolver
490489
Lookup.refreshDefault();

0 commit comments

Comments
 (0)